Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp (modified) (2 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.cpp

@@ -15 +15 @@
 
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
-
-
-btScalar gContactThresholdFactor=btScalar(0.02);
 
 
@@ -48 +45 @@
 btScalar        btCollisionShape::getContactBreakingThreshold() const
 {
-        return getAngularMotionDisc() * gContactThresholdFactor;
+        ///@todo make this 0.1 configurable
+        return getAngularMotionDisc() * btScalar(0.1);
 }
 btScalar        btCollisionShape::getAngularMotionDisc() const