diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2007-07-06 08:30:25 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2007-07-06 08:30:25 +0400 |
| commit | f256efdb346f8623e361be42f4d86d4307b3a258 (patch) | |
| tree | e1694f9fbb0f51ad4b41d1784eb1846821d473c5 /extern/bullet2/src/BulletDynamics | |
| parent | 376be529bb932f867b01466592c33899ee5ec2c8 (diff) | |
fixed issue with kinematic objects
Diffstat (limited to 'extern/bullet2/src/BulletDynamics')
| -rw-r--r-- | extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp index 3dae930a49f..02cf44d0cfa 100644 --- a/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp +++ b/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp @@ -113,7 +113,7 @@ btRigidBody::btRigidBody( btScalar mass,const btTransform& worldTransform,btColl -#define EXPERIMENTAL_JITTER_REMOVAL 1 +//#define EXPERIMENTAL_JITTER_REMOVAL 1 #ifdef EXPERIMENTAL_JITTER_REMOVAL //Bullet 2.20b has experimental damping code to reduce jitter just before objects fall asleep/deactivate //doesn't work very well yet (value 0 disabled this damping) @@ -298,7 +298,14 @@ btQuaternion btRigidBody::getOrientation() const void btRigidBody::setCenterOfMassTransform(const btTransform& xform) { - m_interpolationWorldTransform = xform;//m_worldTransform; + + if (isStaticOrKinematicObject()) + { + m_interpolationWorldTransform = m_worldTransform; + } else + { + m_interpolationWorldTransform = xform; + } m_interpolationLinearVelocity = getLinearVelocity(); m_interpolationAngularVelocity = getAngularVelocity(); m_worldTransform = xform; |