Changeset 1972 for code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp

Timestamp:

Oct 20, 2008, 5:40:38 PM (17 years ago)

Author:

rgrieder

Message:

Downgraded Bullet to latest tagged version: 2.72
That should give us more stability.

File:

• code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp (modified) (1 diff)

code/branches/physics/src/bullet/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp

@@ -886 +886 @@
         const btVector3 delta=  results.witnesses[1]-
                                                         results.witnesses[0];
-        const btScalar  margin= shape0->getMarginNonVirtual()+
-                                                        shape1.getMarginNonVirtual();
+        const btScalar  margin= shape0->getMargin()+
+                                                        shape1.getMargin();
         const btScalar  length= delta.length(); 
         results.normal                  =       delta/length;