TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 09:04:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #611 from Areloch/MatAssetLoadStabilization

Browse source 
Tweaks the MaterialAsset loading logic
This commit is contained in:
Brian Roberts 2021-10-09 00:59:28 -05:00 • committed by GitHub
commit ee824e0f17
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -167,6 +167,12 @@ void MaterialAsset::initializeAsset()
mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath; mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath;
if (mMatDefinitionName == StringTable->EmptyString())
{
mLoadedState = Failed;
return;
}
if (Torque::FS::IsScriptFile(mScriptPath)) if (Torque::FS::IsScriptFile(mScriptPath))
{ {
if (!Sim::findObject(mMatDefinitionName)) if (!Sim::findObject(mMatDefinitionName))
@ -180,6 +186,10 @@ void MaterialAsset::initializeAsset()
mLoadedState = Failed; mLoadedState = Failed;
} }
} }
else
{
mLoadedState = DefinitionAlreadyExists;
}
} }
loadMaterial(); loadMaterial();
@ -189,6 +199,12 @@ void MaterialAsset::onAssetRefresh()
{ {
mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath; mScriptPath = getOwned() ? expandAssetFilePath(mScriptFile) : mScriptPath;
if (mMatDefinitionName == StringTable->EmptyString())
{
mLoadedState = Failed;
return;
}
if (Torque::FS::IsScriptFile(mScriptPath)) if (Torque::FS::IsScriptFile(mScriptPath))
{ {
//Since we're refreshing, we can assume that the file we're executing WILL have an existing definition. //Since we're refreshing, we can assume that the file we're executing WILL have an existing definition.
@ -204,7 +220,6 @@ void MaterialAsset::onAssetRefresh()
//And now that we've executed, switch back to the prior behavior //And now that we've executed, switch back to the prior behavior
Con::setVariable("$Con::redefineBehavior", redefineBehaviorPrev.c_str()); Con::setVariable("$Con::redefineBehavior", redefineBehaviorPrev.c_str());
} }
loadMaterial(); loadMaterial();
@ -232,7 +247,7 @@ void MaterialAsset::loadMaterial()
if (mMaterialDefinition) if (mMaterialDefinition)
SAFE_DELETE(mMaterialDefinition); SAFE_DELETE(mMaterialDefinition);
if (mLoadedState == ScriptLoaded && mMatDefinitionName != StringTable->EmptyString()) if ((mLoadedState == ScriptLoaded || mLoadedState == DefinitionAlreadyExists) && mMatDefinitionName != StringTable->EmptyString())
{ {
Material* matDef; Material* matDef;
if (!Sim::findObject(mMatDefinitionName, matDef)) if (!Sim::findObject(mMatDefinitionName, matDef))

1
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -73,6 +73,7 @@ public:
enum MaterialAssetErrCode enum MaterialAssetErrCode
{ {
ScriptLoaded = AssetErrCode::Extended, ScriptLoaded = AssetErrCode::Extended,
DefinitionAlreadyExists,
Extended Extended
}; };