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

clean up redundant loads, shift first load to getResource methods for sound and shape.

Browse source 
still need to properly sort image
This commit is contained in:
AzaezelX 2023-10-09 14:41:14 -05:00
parent b710a309bd
commit a8d640e311
5 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -224,8 +224,6 @@ void ShapeAsset::initializeAsset()
String normalPath = String(mFilePath) + "_imposter_normals.dds";
mNormalImposterPath = StringTable->insert(normalPath.c_str());
}
//loadShape();
}
void ShapeAsset::setShapeFile(const char* pShapeFile)
@ -461,7 +459,6 @@ U32 ShapeAsset::getAssetByFilename(StringTableEntry fileName, AssetPtr<ShapeAsse
{
//acquire and bind the asset, and return it out
shapeAsset->setAssetId(query.mAssetList[0]);
(*shapeAsset)->loadShape();
return (*shapeAsset)->mLoadedState;
}
}
@ -494,7 +491,6 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
if (shapeAsset->notNull())
{
(*shapeAsset)->loadShape();
return (*shapeAsset)->mLoadedState;
}
else
@ -504,7 +500,6 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
if (shapeAsset->isNull())
{
(*shapeAsset)->loadShape();
//Well that's bad, loading the fallback failed.
Con::warnf("ShapeAsset::getAssetById - Finding of asset with id %s failed with no fallback asset", assetId);
return AssetErrCode::Failed;
@ -513,7 +508,6 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
//handle noshape not being loaded itself
if ((*shapeAsset)->mLoadedState == BadFileReference)
{
(*shapeAsset)->loadShape();
Con::warnf("ShapeAsset::getAssetById - Finding of asset with id %s failed, and fallback asset reported error of Bad File Reference.", assetId);
return AssetErrCode::BadFileReference;
}
@ -540,8 +534,6 @@ void ShapeAsset::onAssetRefresh(void)
// Update.
if(!Platform::isFullPath(mFileName))
mFilePath = getOwned() ? expandAssetFilePath(mFileName) : mFilePath;
loadShape();
}
void ShapeAsset::SplitSequencePathAndName(String& srcPath, String& srcName)