diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp index 580ea345860..cf8ed59a541 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp @@ -31,6 +31,7 @@ btCollisionObject::btCollisionObject() m_activationState1(1), m_deactivationTime(btScalar(0.)), m_friction(btScalar(0.5)), + m_rollingFriction(0.0f), m_restitution(btScalar(0.)), m_internalType(CO_COLLISION_OBJECT), m_userObjectPointer(0), @@ -46,18 +47,18 @@ btCollisionObject::~btCollisionObject() { } -void btCollisionObject::setActivationState(int newState) +void btCollisionObject::setActivationState(int newState) const { if ( (m_activationState1 != DISABLE_DEACTIVATION) && (m_activationState1 != DISABLE_SIMULATION)) m_activationState1 = newState; } -void btCollisionObject::forceActivationState(int newState) +void btCollisionObject::forceActivationState(int newState) const { m_activationState1 = newState; } -void btCollisionObject::activate(bool forceActivation) +void btCollisionObject::activate(bool forceActivation) const { if (forceActivation || !(m_collisionFlags & (CF_STATIC_OBJECT|CF_KINEMATIC_OBJECT))) { @@ -85,9 +86,9 @@ const char* btCollisionObject::serialize(void* dataBuffer, btSerializer* seriali dataOut->m_islandTag1 = m_islandTag1; dataOut->m_companionId = m_companionId; dataOut->m_activationState1 = m_activationState1; - dataOut->m_activationState1 = m_activationState1; dataOut->m_deactivationTime = m_deactivationTime; dataOut->m_friction = m_friction; + dataOut->m_rollingFriction = m_rollingFriction; dataOut->m_restitution = m_restitution; dataOut->m_internalType = m_internalType; @@ -100,7 +101,6 @@ const char* btCollisionObject::serialize(void* dataBuffer, btSerializer* seriali dataOut->m_hitFraction = m_hitFraction; dataOut->m_ccdSweptSphereRadius = m_ccdSweptSphereRadius; dataOut->m_ccdMotionThreshold = m_ccdMotionThreshold; - dataOut->m_ccdMotionThreshold = m_ccdMotionThreshold; dataOut->m_checkCollideWith = m_checkCollideWith; return btCollisionObjectDataName; |