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

Merge pull request #1230 from Azaezel/notSoShocking

Browse source 
removal of  un-implemented ShockwaveData entries from explosion.
This commit is contained in:
Daniel Buckmaster 2015-03-01 18:27:21 +11:00
commit 5118d4bc63
2 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -254,10 +254,6 @@ ExplosionData::ExplosionData()
lifetimeVariance = 0; lifetimeVariance = 0;
offset = 0.0f; offset = 0.0f;
shockwave = NULL;
shockwaveID = 0;
shockwaveOnTerrain = false;
shakeCamera = false; shakeCamera = false;
camShakeFreq.set( 10.0f, 10.0f, 10.0f ); camShakeFreq.set( 10.0f, 10.0f, 10.0f );
camShakeAmp.set( 1.0f, 1.0f, 1.0f ); camShakeAmp.set( 1.0f, 1.0f, 1.0f );
@ -321,9 +317,6 @@ void ExplosionData::initPersistFields()
"explosion.\n\n" "explosion.\n\n"
"@see particleEmitter" ); "@see particleEmitter" );
// addField( "shockwave", TypeShockwaveDataPtr, Offset(shockwave, ExplosionData) );
// addField( "shockwaveOnTerrain", TypeBool, Offset(shockwaveOnTerrain, ExplosionData) );
addField( "debris", TYPEID< DebrisData >(), Offset(debrisList, ExplosionData), EC_NUM_DEBRIS_TYPES, addField( "debris", TYPEID< DebrisData >(), Offset(debrisList, ExplosionData), EC_NUM_DEBRIS_TYPES,
"List of DebrisData objects to spawn with this explosion." ); "List of DebrisData objects to spawn with this explosion." );
addField( "debrisThetaMin", TypeF32, Offset(debrisThetaMin, ExplosionData), addField( "debrisThetaMin", TypeF32, Offset(debrisThetaMin, ExplosionData),

5
Engine/source/T3D/fx/explosion.h
View file

@ -41,7 +41,6 @@ class ParticleEmitterData;
class TSThread; class TSThread;
class SFXTrack; class SFXTrack;
struct DebrisData; struct DebrisData;
class ShockwaveData;
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
class ExplosionData : public GameBaseData { class ExplosionData : public GameBaseData {
@ -77,10 +76,6 @@ class ExplosionData : public GameBaseData {
ParticleEmitterData* emitterList[EC_NUM_EMITTERS]; ParticleEmitterData* emitterList[EC_NUM_EMITTERS];
S32 emitterIDList[EC_NUM_EMITTERS]; S32 emitterIDList[EC_NUM_EMITTERS];
ShockwaveData * shockwave;
S32 shockwaveID;
bool shockwaveOnTerrain;
DebrisData * debrisList[EC_NUM_DEBRIS_TYPES]; DebrisData * debrisList[EC_NUM_DEBRIS_TYPES];
S32 debrisIDList[EC_NUM_DEBRIS_TYPES]; S32 debrisIDList[EC_NUM_DEBRIS_TYPES];