Changeset 8393 for code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp (modified) (2 diffs)

code/trunk/src/external/bullet/BulletDynamics/Dynamics/btRigidBody.cpp

@@ -52 +52 @@
         m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
         m_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
-        m_linearDamping = btScalar(0.);
-        m_angularDamping = btScalar(0.5);
+    setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
+
         m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold;
         m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold;
@@ -85 +85 @@
         
         setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia);
-    setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
         updateInertiaTensor();