TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 23:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1552 from Areloch/terrainLoadedStateFix

Browse source 
Makes sure the loading code for terrain assets is properly assigned.
This commit is contained in:
Brian Roberts 2025-09-15 21:40:18 -05:00 • committed by GitHub
commit 099da1764f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/T3D/assets/TerrainAsset.cpp
View file

@ -191,8 +191,14 @@ void TerrainAsset::setTerrainFileName(const char* pScriptFile)
U32 TerrainAsset::load() U32 TerrainAsset::load()
{ {
if (mLoadedState == AssetErrCode::Ok)
return mLoadedState;
if (!Torque::FS::IsFile(mTerrainFilePath)) if (!Torque::FS::IsFile(mTerrainFilePath))
return BadFileReference; {
mLoadedState = BadFileReference;
return mLoadedState;
}
mTerrMaterialAssets.clear(); mTerrMaterialAssets.clear();
mTerrMaterialAssetIds.clear(); mTerrMaterialAssetIds.clear();
@ -229,9 +235,15 @@ U32 TerrainAsset::load()
mTerrainFile = ResourceManager::get().load(mTerrainFilePath); mTerrainFile = ResourceManager::get().load(mTerrainFilePath);
if (mTerrainFile) if (mTerrainFile)
return Ok; {
mLoadedState = Ok;
}
else
{
mLoadedState = BadFileReference;
}
return BadFileReference; return mLoadedState;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------