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

improvements/bugfixes related to kinematic(animated) objects, synchronizeMotionStates

Browse Source
This commit is contained in:
ejcoumans
2006-10-19 15:20:38 +00:00
parent d11572a4d7
commit 289c5ca7fe
9 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/BulletCollision/CollisionDispatch/btCollisionObject.h
View File

@@ -92,6 +92,11 @@ struct btCollisionObject
return m_collisionFlags & CF_KINEMATIC_OJBECT;
}
inline bool isStaticOrKinematicObject() const
{
return m_collisionFlags & (CF_KINEMATIC_OJBECT | CF_STATIC_OBJECT);
}
inline bool hasContactResponse() const {
return !(m_collisionFlags & CF_NO_CONTACT_RESPONSE);
}

10
src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp
View File

@@ -237,6 +237,16 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,
if (((colObj0) && colObj0->GetActivationState() != ISLAND_SLEEPING) ||
((colObj1) && colObj1->GetActivationState() != ISLAND_SLEEPING))
{
//kinematic objects don't merge islands, but wake up all connected objects
if (colObj0->isKinematicObject() && colObj0->GetActivationState() != ISLAND_SLEEPING)
{
colObj1->SetActivationState(ACTIVE_TAG);
}
if (colObj1->isKinematicObject() && colObj1->GetActivationState() != ISLAND_SLEEPING)
{
colObj0->SetActivationState(ACTIVE_TAG);
}
//filtering for response
if (dispatcher->needsResponse(colObj0,colObj1))
islandmanifold.push_back(manifold);