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

don't initialize damping twice, it is confusing.

Browse Source 
See Issue 472, thanks Daniel.
This commit is contained in:
erwin.coumans
2011-02-27 03:39:31 +00:00
parent 4e8596eef5
commit 2049fb2cfa
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,8 +51,8 @@ void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo&
m_gravity_acceleration.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.); setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
m_angularDamping = btScalar(0.5);
m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold; m_linearSleepingThreshold = constructionInfo.m_linearSleepingThreshold;
m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold; m_angularSleepingThreshold = constructionInfo.m_angularSleepingThreshold;
m_optionalMotionState = constructionInfo.m_motionState; m_optionalMotionState = constructionInfo.m_motionState;
@@ -84,7 +84,6 @@ void btRigidBody::setupRigidBody(const btRigidBody::btRigidBodyConstructionInfo&
m_debugBodyId = uniqueId++; m_debugBodyId = uniqueId++;
setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia); setMassProps(constructionInfo.m_mass, constructionInfo.m_localInertia);
setDamping(constructionInfo.m_linearDamping, constructionInfo.m_angularDamping);
updateInertiaTensor(); updateInertiaTensor();
m_rigidbodyFlags = 0; m_rigidbodyFlags = 0;