Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btCollisionShape.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/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);
 
 
@@ -45 +48 @@
 btScalar        btCollisionShape::getContactBreakingThreshold() const
 {
-        ///@todo make this 0.1 configurable
-        return getAngularMotionDisc() * btScalar(0.1);
+        return getAngularMotionDisc() * gContactThresholdFactor;
 }
 btScalar        btCollisionShape::getAngularMotionDisc() const