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

try to load shapes during preload

Browse source 
it's half the point of the protocol
This commit is contained in:
AzaezelX 2025-07-06 19:51:55 -05:00
parent c138d838bb
commit e8ccb3443a
18 changed files with 63 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/afx/afxMagicMissile.h
View file

@ -139,7 +139,7 @@ public:
*/
// variables set on preload:
Resource<TSShape> projectileShape;
TSShape* projectileShape;
/*
S32 activateSeq;
S32 maintainSeq;

14
Engine/source/afx/ce/afxModel.cpp
View file

@ -127,14 +127,8 @@ bool afxModelData::preload(bool server, String &errorStr)
if (server)
return true;
if (mShapeAsset.notNull())
if (getShape())
{
if (!getShape())
{
errorStr = String::ToString("afxModelData::load: Failed to load shape \"%s\"", _getShapeAssetId());
return false;
}
// just parse up the string and collect the remappings in txr_tag_remappings.
if (remap_txr_tags != ST_NULLSTRING)
{
@ -167,7 +161,11 @@ bool afxModelData::preload(bool server, String &errorStr)
delete pDummy;
}
}
else
{
errorStr = String::ToString("afxModelData::load: Failed to load shape \"%s\"", _getShapeAssetId());
return false;
}
return true;
}