Changeset 2907 for code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h

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/BulletDynamics/Dynamics/btRigidBody.h (modified) (3 diffs)

code/branches/questsystem5/src/bullet/BulletDynamics/Dynamics/btRigidBody.h

@@ -49 +49 @@
 
         btVector3               m_gravity;      
+        btVector3               m_gravity_acceleration;
         btVector3               m_invInertiaLocal;
         btVector3               m_totalForce;
@@ -182 +183 @@
         const btVector3&        getGravity() const
         {
-                return m_gravity;
+                return m_gravity_acceleration;
         }
 
@@ -232 +233 @@
                 m_totalForce += force;
         }
+
+        const btVector3& getTotalForce()
+        {
+                return m_totalForce;
+        };
+
+        const btVector3& getTotalTorque()
+        {
+                return m_totalTorque;
+        };
     
-        const btVector3& getInvInertiaDiagLocal()
+        const btVector3& getInvInertiaDiagLocal() const
         {
                 return m_invInertiaLocal;