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

shapes are optional for projectiles. not mandatory.

Browse source 
and stop yelling in the console mid way through loading.
This commit is contained in:
AzaezelX 2025-07-07 16:49:56 -05:00
parent 5dbcaf55c7
commit 4eae51992e
6 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -368,7 +368,6 @@ U32 ShapeAsset::load()
if (!mShape)
{
Con::errorf("ShapeAsset::loadShape : failed to load shape file %s (%s)!", getAssetName(), mShapeFile);
mLoadedState = BadFileReference;
return mLoadedState; //if it failed to load, bail out
}

10
Engine/source/T3D/debris.cpp
View file

@ -276,12 +276,10 @@ bool DebrisData::preload(bool server, String &errorStr)
if (getShape())
{
{
TSShapeInstance* pDummy = new TSShapeInstance(getShape(), !server);
delete pDummy;
if (!server && !getShape()->preloadMaterialList(getShapeFile()) && NetConnection::filesWereDownloaded())
return false;
}
TSShapeInstance* pDummy = new TSShapeInstance(getShape(), !server);
delete pDummy;
if (!server && !getShape()->preloadMaterialList(getShapeFile()) && NetConnection::filesWereDownloaded())
return false;
}
else if (!mShapeAsset.isNull())
{

8
Engine/source/T3D/fx/explosion.cpp
View file

@ -905,7 +905,13 @@ bool ExplosionData::preload(bool server, String &errorStr)
TSShapeInstance* pDummy = new TSShapeInstance(getExplosionShape(), !server);
delete pDummy;
} else {
}
else if (mExplosionShapeAsset.notNull())
{
errorStr = String::ToString("ExplosionData::preload: Couldn't load shape \"%s\"", _getExplosionShapeAssetId());
return false;
}
else {
explosionAnimation = -1;
}

4
Engine/source/T3D/projectile.cpp
View file

@ -389,9 +389,9 @@ bool ProjectileData::preload(bool server, String &errorStr)
TSShapeInstance* pDummy = new TSShapeInstance(getProjectileShape(), !server);
delete pDummy;
}
else
else if (mProjectileShapeAsset.notNull())
{
errorStr = String::ToString("ProjectileData::load: Couldn't load shape \"%s\"", _getProjectileShapeAssetId());
errorStr = String::ToString("ProjectileData::preload: Couldn't load shape \"%s\"", _getProjectileShapeAssetId());
return false;
}

2
Engine/source/T3D/shapeBase.cpp
View file

@ -499,6 +499,8 @@ bool ShapeBaseData::preload(bool server, String &errorStr)
}
}
}
else
Con::errorf("ShapeBaseData::preload -%s failed: %s", mShapeAsset.getAssetId(), ShapeAsset::getAssetErrstrn(assetStatus));
}
if(!server)

2
Engine/source/ts/tsShapeConstruct.cpp
View file

@ -559,7 +559,7 @@ void TSShapeConstructor::setShapeAssetId(StringTableEntry assetId)
mShapeAsset = mShapeAssetId;
if (mShapeAsset.notNull())
{
Resource<TSShape> shape = mShapeAsset->getShapeResource();
TSShape* shape = mShapeAsset->getShape();
if (shape)
_onLoad(shape);