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

Merge pull request #539 from DavidWyand-GG/ProjectileFix

Browse source 
Fix for ballistic projectiles not bouncing
This commit is contained in:
David Wyand 2013-12-02 23:16:09 -08:00
parent d5beea41c8 ba81917392
commit 65099897f4
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1110,7 +1110,6 @@ void Projectile::simulate( F32 dt )
xform.setColumn( 3, rInfo.point );
setTransform( xform );
mCurrPosition = rInfo.point;
mCurrVelocity = Point3F::Zero;
// Get the object type before the onCollision call, in case
// the object is destroyed.
@ -1141,7 +1140,10 @@ void Projectile::simulate( F32 dt )
onCollision( rInfo.point, rInfo.normal, rInfo.object );
// Next order of business: do we explode on this hit?
if ( mCurrTick > mDataBlock->armingDelay || mDataBlock->armingDelay == 0 )
{
mCurrVelocity = Point3F::Zero;
explode( rInfo.point, rInfo.normal, objectType );
}
if ( mDataBlock->isBallistic )
{
@ -1162,6 +1164,10 @@ void Projectile::simulate( F32 dt )
//F32 timeLeft = 1.0f - rInfo.t;
newPosition = oldPosition = rInfo.point + rInfo.normal * 0.05f;
}
else
{
mCurrVelocity = Point3F::Zero;
}
}
// re-enable the collision response on the source object now