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

fix particle glow

Browse source 
multiple preloads were failing to return false or mesages on failure of mandatory entries.
clear out redundant isScriptFile definition
fix default order of /scripts/managedData script files
This commit is contained in:
AzaezelX 2025-11-13 14:29:25 -06:00
parent 5d260bc58f
commit cce40efd35
21 changed files with 250 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -637,6 +637,7 @@ bool ExplosionData::onAdd()
if( !Sim::findObject( debrisIDList[i], debrisList[i] ) )
{
Con::errorf( ConsoleLogEntry::General, "ExplosionData::onAdd: Invalid packet, bad datablockId(debris): 0x%x", debrisIDList[i] );
return false;
}
}
}
@ -648,6 +649,7 @@ bool ExplosionData::onAdd()
if( Sim::findObject( emitterIDList[i], emitterList[i] ) == false)
{
Con::errorf( ConsoleLogEntry::General, "ExplosionData::onAdd: Invalid packet, bad datablockId(particle emitter): 0x%x", emitterIDList[i] );
return false;
}
}
}
@ -659,6 +661,7 @@ bool ExplosionData::onAdd()
if( Sim::findObject( explosionIDList[k], explosionList[k] ) == false)
{
Con::errorf( ConsoleLogEntry::General, "ExplosionData::onAdd: Invalid packet, bad datablockId(explosion): 0x%x", explosionIDList[k] );
return false;
}
}
}
@ -880,20 +883,34 @@ bool ExplosionData::preload(bool server, String &errorStr)
if (Parent::preload(server, errorStr) == false)
return false;
if( !server )
if (!server)
{
if (!isSoundValid())
{
//return false; -TODO: trigger asset download
}
if (!particleEmitter && particleEmitterId != 0)
{
if (Sim::findObject(particleEmitterId, particleEmitter) == false)
{
Con::errorf(ConsoleLogEntry::General, "Error, unable to load particle emitter for explosion datablock");
errorStr = String::ToString("Error, unable to load particle emitter for explosion datablock");
return false;
}
}
U32 i;
for (i = 0; i < EC_NUM_EMITTERS; i++)
{
if (!emitterList[i] && emitterIDList[i] != 0)
{
if (Sim::findObject(emitterIDList[i], emitterList[i]) == false)
{
errorStr = String::ToString("Error, unable to load emitter[%i] for explosion datablock 0x%x", i, emitterIDList[i]);
return false;
}
}
}
}
if (getExplosionShape()) {