add 'force activate', for static/kinematic objects that get moved.

fixed some activation issues with kinematic objects
This commit is contained in:
ejcoumans
2006-11-21 13:00:18 +00:00
parent f4e8bf70c5
commit 0757f1fe9e
5 changed files with 31 additions and 10 deletions

View File

@@ -41,9 +41,9 @@ void btCollisionObject::forceActivationState(int newState)
m_activationState1 = newState;
}
void btCollisionObject::activate()
void btCollisionObject::activate(bool forceActivation)
{
if (!(m_collisionFlags & (CF_STATIC_OBJECT|CF_KINEMATIC_OBJECT)))
if (forceActivation || !(m_collisionFlags & (CF_STATIC_OBJECT|CF_KINEMATIC_OBJECT)))
{
setActivationState(ACTIVE_TAG);
m_deactivationTime = 0.f;