TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

report shape file location that failed to load, set loaded status to badfilereference if getAssetById can't even find noshape

Browse source
This commit is contained in:
AzaezelX 2020-12-31 18:54:31 -06:00
parent 1fbf46fa90
commit 6495ee16c6
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -274,7 +274,7 @@ bool ShapeAsset::loadShape()
if (!mShape)
{
Con::errorf("ShapeAsset::loadShape : failed to load shape file!");
Con::errorf("ShapeAsset::loadShape : failed to load shape file %s!", mFilePath);
mLoadedState = BadFileReference;
return false; //if it failed to load, bail out
}
@ -437,12 +437,16 @@ U32 ShapeAsset::getAssetById(StringTableEntry assetId, AssetPtr<ShapeAsset>* sha
if ((*shapeAsset))
return (*shapeAsset)->mLoadedState;
//Didn't work, so have us fall back to a placeholder asset
StringTableEntry noShapeId = StringTable->insert("Core_Rendering:noshape");
shapeAsset->setAssetId(noShapeId);
if (shapeAsset->notNull())
{
//Didn't work, so have us fall back to a placeholder asset
StringTableEntry noShapeId = StringTable->insert("Core_Rendering:noshape");
shapeAsset->setAssetId(noShapeId);
//handle noshape not being loaded itself
if ((*shapeAsset)->mLoadedState == BadFileReference)
return AssetErrCode::Failed;
(*shapeAsset)->mLoadedState = AssetErrCode::UsingFallback;
return AssetErrCode::UsingFallback;
}