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

More turns

Browse source 
-Flying Vehicle
-Proximinity Mine
This commit is contained in:
marauder2k7 2021-09-20 14:17:10 +01:00
parent 704eb27600
commit 30b57c0f95
4 changed files with 50 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Engine/source/T3D/proximityMine.cpp
View file

@ -74,16 +74,16 @@ IMPLEMENT_CALLBACK( ProximityMineData, onExplode, void, ( ProximityMine* obj, Po
ProximityMineData::ProximityMineData()
: armingDelay( 0 ),
armingSequence( -1 ),
armingSound( NULL ),
triggerRadius( 5.0f ),
triggerSpeed( 1.0f ),
autoTriggerDelay( 0 ),
triggerOnOwner( false ),
triggerDelay( 0 ),
triggerSequence( -1 ),
triggerSound( NULL ),
explosionOffset( 0.05f )
{
INIT_SOUNDASSET(ArmSound);
INIT_SOUNDASSET(TriggerSound);
}
void ProximityMineData::initPersistFields()
@ -91,9 +91,9 @@ void ProximityMineData::initPersistFields()
addGroup( "Arming" );
addField( "armingDelay", TypeF32, Offset(armingDelay, ProximityMineData),
"Delay (in seconds) from when the mine is placed to when it becomes active." );
addField( "armingSound", TypeSFXTrackName, Offset(armingSound, ProximityMineData),
"Sound to play when the mine is armed (starts at the same time as "
"the <i>armed</i> sequence if defined)." );
INITPERSISTFIELD_SOUNDASSET(ArmSound, ProximityMineData, "Arming sound for this proximity mine.");
endGroup( "Arming" );
addGroup( "Triggering" );
@ -111,9 +111,9 @@ void ProximityMineData::initPersistFields()
"Speed above which moving objects within the trigger radius will trigger the mine" );
addField( "triggerDelay", TypeF32, Offset(triggerDelay, ProximityMineData),
"Delay (in seconds) from when the mine is triggered until it explodes." );
addField( "triggerSound", TypeSFXTrackName, Offset(triggerSound, ProximityMineData),
"Sound to play when the mine is triggered (starts at the same time as "
"the <i>triggered</i> sequence if defined)." );
INITPERSISTFIELD_SOUNDASSET(TriggerSound, ProximityMineData, "Arming sound for this proximity mine.");
endGroup( "Triggering" );
addGroup( "Explosion" );
@ -135,12 +135,10 @@ bool ProximityMineData::preload( bool server, String& errorStr )
if ( !server )
{
// Resolve sounds
String sfxErrorStr;
if( !sfxResolve( &armingSound, sfxErrorStr ) )
Con::errorf( ConsoleLogEntry::General, "ProximityMineData::preload: Invalid packet: %s", sfxErrorStr.c_str() );
if( !sfxResolve( &triggerSound, sfxErrorStr ) )
Con::errorf( ConsoleLogEntry::General, "ProximityMineData::preload: Invalid packet: %s", sfxErrorStr.c_str() );
if( !getArmSound() )
Con::errorf( ConsoleLogEntry::General, "ProximityMineData::preload: Invalid arming sound." );
if( !getTriggerSound() )
Con::errorf( ConsoleLogEntry::General, "ProximityMineData::preload: Invalid trigger sound." );
}
if ( mShape )
@ -158,14 +156,14 @@ void ProximityMineData::packData( BitStream* stream )
Parent::packData( stream );
stream->write( armingDelay );
sfxWrite( stream, armingSound );
PACKDATA_SOUNDASSET(ArmSound);
stream->write( autoTriggerDelay );
stream->writeFlag( triggerOnOwner );
stream->write( triggerRadius );
stream->write( triggerSpeed );
stream->write( triggerDelay );
sfxWrite( stream, triggerSound );
PACKDATA_SOUNDASSET(TriggerSound);
}
void ProximityMineData::unpackData( BitStream* stream )
@ -173,14 +171,14 @@ void ProximityMineData::unpackData( BitStream* stream )
Parent::unpackData(stream);
stream->read( &armingDelay );
sfxRead( stream, &armingSound );
UNPACKDATA_SOUNDASSET(ArmSound);
stream->read( &autoTriggerDelay );
triggerOnOwner = stream->readFlag();
stream->read( &triggerRadius );
stream->read( &triggerSpeed );
stream->read( &triggerDelay );
sfxRead( stream, &triggerSound );
UNPACKDATA_SOUNDASSET(TriggerSound);
}
//----------------------------------------------------------------------------
@ -428,8 +426,8 @@ void ProximityMine::processTick( const Move* move )
mAnimThread = mShapeInstance->addThread();
mShapeInstance->setSequence( mAnimThread, mDataBlock->armingSequence, 0.0f );
}
if ( mDataBlock->armingSound )
SFX->playOnce( mDataBlock->armingSound, &getRenderTransform() );
if ( mDataBlock->getArmSound() )
SFX->playOnce( mDataBlock->getArmSoundAsset()->getSfxProfile(), &getRenderTransform() );
}
break;
@ -469,8 +467,8 @@ void ProximityMine::processTick( const Move* move )
mAnimThread = mShapeInstance->addThread();
mShapeInstance->setSequence( mAnimThread, mDataBlock->triggerSequence, 0.0f );
}
if ( mDataBlock->triggerSound )
SFX->playOnce( mDataBlock->triggerSound, &getRenderTransform() );
if ( mDataBlock->getTriggerSound() )
SFX->playOnce( mDataBlock->getTriggerSoundAsset()->getSfxProfile(), &getRenderTransform() );
if ( isServerObject() )
mDataBlock->onTriggered_callback( this, sql.mList[0] );