kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

BGE bug #18624: Collision detection fails on parented objects. Partial fix, parented shape now moves with the parent but still the parent near detector detects the child only in the zone where it was parented.

Browse Source
This commit is contained in:
Benoit Bolsee 2009-04-27 16:40:26 +00:00
parent 369c8b8055
commit c56ee09c48
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
View File

@ -361,6 +361,7 @@ void KX_BulletPhysicsController::SuspendDynamics(bool ghost)
btBroadphaseProxy* handle = body->getBroadphaseHandle();
m_savedCollisionFlags = body->getCollisionFlags();
m_savedMass = GetMass();
m_savedDyna = m_bDyna;
m_savedCollisionFilterGroup = handle->m_collisionFilterGroup;
m_savedCollisionFilterMask = handle->m_collisionFilterMask;
m_savedActivationState = body->getActivationState();
@ -370,6 +371,7 @@ void KX_BulletPhysicsController::SuspendDynamics(bool ghost)
btCollisionObject::CF_STATIC_OBJECT|((ghost)?btCollisionObject::CF_NO_CONTACT_RESPONSE:(m_savedCollisionFlags&btCollisionObject::CF_NO_CONTACT_RESPONSE)),
btBroadphaseProxy::StaticFilter,
btBroadphaseProxy::AllFilter ^ btBroadphaseProxy::StaticFilter);
m_bDyna = false;
}
}
@ -384,6 +386,7 @@ void KX_BulletPhysicsController::RestoreDynamics()
m_savedCollisionFilterGroup,
m_savedCollisionFilterMask);
body->forceActivationState(m_savedActivationState);
m_bDyna = m_savedDyna;
}
}

1
source/gameengine/Ketsji/KX_BulletPhysicsController.h
View File

@ -13,6 +13,7 @@ private:
short int m_savedCollisionFilterGroup;
short int m_savedCollisionFilterMask;
MT_Scalar m_savedMass;
bool m_savedDyna;
btCollisionShape* m_bulletChildShape;
public: