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

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.h (modified) (6 diffs)

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

@@ -14 +14 @@
 */
 
-#ifndef RIGIDBODY_H
-#define RIGIDBODY_H
+#ifndef BT_RIGIDBODY_H
+#define BT_RIGIDBODY_H
 
 #include "LinearMath/btAlignedObjectArray.h"
@@ -90 +90 @@
         
         int                             m_debugBodyId;
-
+        
 
 protected:
@@ -271 +271 @@
         }
 
-        const btVector3& getTotalForce()
+        const btVector3& getTotalForce() const
         {
                 return m_totalForce;
         };
 
-        const btVector3& getTotalTorque()
+        const btVector3& getTotalTorque() const
         {
                 return m_totalTorque;
@@ -505 +505 @@
         }
 
-        int getNumConstraintRefs()
+        int getNumConstraintRefs() const
         {
                 return m_constraintRefs.size();
@@ -618 +618 @@
 
         void    internalWritebackVelocity(btScalar timeStep);
+
         
 
@@ -687 +688 @@
 
 
-#endif
-
+#endif //BT_RIGIDBODY_H
+