Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

finally applied this 'getGravity' patch, so getGravity matches setGravity.

Browse Source 
Thanks to Evgeny for the report/patch:
http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=9&t=1852
http://code.google.com/p/bullet/issues/detail?id=23
This commit is contained in:
erwin.coumans
2008-12-09 02:16:05 +00:00
parent 6db1b932fd
commit 8ed2db9b42
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletDynamics/Dynamics/btRigidBody.cpp
View File

@@ -46,6 +46,7 @@ void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo&
m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.)); m_angularVelocity.setValue(btScalar(0.),btScalar(0.),btScalar(0.));
m_angularFactor = btScalar(1.); m_angularFactor = btScalar(1.);
m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)); m_gravity.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
m_gravity_acceleration.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0));
m_totalForce.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)); 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_totalTorque.setValue(btScalar(0.0), btScalar(0.0), btScalar(0.0)),
m_linearDamping = btScalar(0.); m_linearDamping = btScalar(0.);
@@ -124,6 +125,7 @@ void btRigidBody::setGravity(const btVector3& acceleration)
{ {
m_gravity = acceleration * (btScalar(1.0) / m_inverseMass); m_gravity = acceleration * (btScalar(1.0) / m_inverseMass);
} }
m_gravity_acceleration = acceleration;
} }

3
src/BulletDynamics/Dynamics/btRigidBody.h
View File

@@ -48,6 +48,7 @@ class btRigidBody : public btCollisionObject
btScalar m_angularFactor; btScalar m_angularFactor;
btVector3 m_gravity; btVector3 m_gravity;
btVector3 m_gravity_acceleration;
btVector3 m_invInertiaLocal; btVector3 m_invInertiaLocal;
btVector3 m_totalForce; btVector3 m_totalForce;
btVector3 m_totalTorque; btVector3 m_totalTorque;
@@ -181,7 +182,7 @@ public:
const btVector3& getGravity() const const btVector3& getGravity() const
{ {
return m_gravity; return m_gravity_acceleration;
} }
void setDamping(btScalar lin_damping, btScalar ang_damping); void setDamping(btScalar lin_damping, btScalar ang_damping);