TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-10 22:24:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

asset load refactor

Browse source 
genral load method, now returns loadedstate across the board
This commit is contained in:
AzaezelX 2023-11-12 16:33:17 -06:00
parent 11ad16583e
commit 1cf754dbca
13 changed files with 50 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/T3D/assets/TerrainMaterialAsset.cpp
View file

@ -202,7 +202,7 @@ void TerrainMaterialAsset::initializeAsset()
}
}
loadMaterial();
load();
}
void TerrainMaterialAsset::onAssetRefresh()
@ -232,7 +232,7 @@ void TerrainMaterialAsset::onAssetRefresh()
Con::setVariable("$Con::redefineBehavior", redefineBehaviorPrev.c_str());
}
loadMaterial();
load();
}
void TerrainMaterialAsset::setScriptFile(const char* pScriptFile)
@ -251,7 +251,7 @@ void TerrainMaterialAsset::setScriptFile(const char* pScriptFile)
//------------------------------------------------------------------------------
void TerrainMaterialAsset::loadMaterial()
U32 TerrainMaterialAsset::load()
{
if (mMaterialDefinition)
mMaterialDefinition->safeDeleteObject();
@ -287,7 +287,7 @@ void TerrainMaterialAsset::loadMaterial()
}
if(mLoadedState == Ok)
return;
return mLoadedState;
}
else if ((mLoadedState == ScriptLoaded || mLoadedState == DefinitionAlreadyExists) && mMatDefinitionName != StringTable->EmptyString())
{
@ -296,17 +296,18 @@ void TerrainMaterialAsset::loadMaterial()
{
Con::errorf("TerrainMaterialAsset: Unable to find the Material %s", mMatDefinitionName);
mLoadedState = BadFileReference;
return;
return mLoadedState;
}
mMaterialDefinition = matDef;
mLoadedState = Ok;
mMaterialDefinition->setInternalName(getAssetId());
return;
return mLoadedState;
}
mLoadedState = Failed;
return mLoadedState;
}
//------------------------------------------------------------------------------