Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp (modified) (2 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/NarrowPhaseCollision/btContinuousConvexCollision.cpp

@@ -136 +136 @@
                         //btScalar clippedDist  = dist;
                         
+                        //don't report time of impact for motion away from the contact normal (or causes minor penetration)
+                        if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=SIMD_EPSILON)
+                                return false;
                         
                         dLambda = dist / (projectedLinearVelocity+ maxAngularProjectedVelocity);
@@ -197 +200 @@
 
                 }
-
-                //don't report time of impact for motion away from the contact normal (or causes minor penetration)
+        
                 if ((projectedLinearVelocity+ maxAngularProjectedVelocity)<=result.m_allowedPenetration)//SIMD_EPSILON)
                         return false;
-
+                        
                 result.m_fraction = lambda;
                 result.m_normal = n;