Forráskód Böngészése

Merge pull request #1463 from Azaezel/bulletBreak3

missed a convexSweepTest early-out check.
Areloch 9 éve
szülő
commit
113bb6b62d
1 módosított fájl, 2 hozzáadás és 1 törlés
  1. 2 1
      Engine/source/T3D/physics/bullet/btPlayer.cpp

+ 2 - 1
Engine/source/T3D/physics/bullet/btPlayer.cpp

@@ -341,7 +341,8 @@ void BtPlayer::_stepForward( btVector3 *inOutCurrPos, const btVector3 &displacem
 		callback.m_collisionFilterGroup = mGhostObject->getBroadphaseHandle()->m_collisionFilterGroup;
 		callback.m_collisionFilterGroup = mGhostObject->getBroadphaseHandle()->m_collisionFilterGroup;
 		callback.m_collisionFilterMask = mGhostObject->getBroadphaseHandle()->m_collisionFilterMask;
 		callback.m_collisionFilterMask = mGhostObject->getBroadphaseHandle()->m_collisionFilterMask;
 
 
-		mGhostObject->convexSweepTest( mColShape, start, end, callback, 0.0f );
+      if (disp.length()>0.0001)
+         mGhostObject->convexSweepTest( mColShape, start, end, callback, 0.0f );
 
 
       // Subtract from the travel fraction.
       // Subtract from the travel fraction.
       fraction -= callback.m_closestHitFraction;
       fraction -= callback.m_closestHitFraction;