TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-23 16:43:50 +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/MaterialAsset.cpp
View file

@ -206,7 +206,7 @@ void MaterialAsset::initializeAsset()
}
}
loadMaterial();
load();
}
void MaterialAsset::onAssetRefresh()
@ -236,7 +236,7 @@ void MaterialAsset::onAssetRefresh()
Con::setVariable("$Con::redefineBehavior", redefineBehaviorPrev.c_str());
}
loadMaterial();
load();
}
void MaterialAsset::setScriptFile(const char* pScriptFile)
@ -255,7 +255,7 @@ void MaterialAsset::setScriptFile(const char* pScriptFile)
//------------------------------------------------------------------------------
void MaterialAsset::loadMaterial()
U32 MaterialAsset::load()
{
if (mMaterialDefinition)
{
@ -274,7 +274,7 @@ void MaterialAsset::loadMaterial()
mLoadedState = Ok;
mMaterialDefinition->setInternalName(getAssetId());
mMaterialDefinition->reload();
return;
return mLoadedState;
}
}
}
@ -286,7 +286,7 @@ void MaterialAsset::loadMaterial()
{
Con::errorf("MaterialAsset: Unable to find the Material %s", mMatDefinitionName);
mLoadedState = BadFileReference;
return;
return mLoadedState;
}
mMaterialDefinition = matDef;
@ -294,10 +294,11 @@ void MaterialAsset::loadMaterial()
mLoadedState = Ok;
mMaterialDefinition->setInternalName(getAssetId());
mMaterialDefinition->reload();
return;
return mLoadedState;
}
mLoadedState = Failed;
return mLoadedState;
}
//------------------------------------------------------------------------------