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

reverted 'getActiveObjects', island management will be improved for Bullet 2.74 release.

Browse Source 
The implementation was error-prone and could lead to crashes.

See http://code.google.com/p/bullet/issues/detail?id=128
This commit is contained in:
erwin.coumans
2008-11-11 16:19:20 +00:00
parent 0384562db0
commit 1381394dd8
4 changed files with 16 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,18 +273,10 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
//kinematic objects don't merge islands, but wake up all connected objects
if (colObj0->isKinematicObject() && colObj0->getActivationState() != ISLAND_SLEEPING)
{
if (!colObj1->isActive())
{
collisionWorld->getActiveObjects().push_back(colObj1);
}
colObj1->activate();
}
if (colObj1->isKinematicObject() && colObj1->getActivationState() != ISLAND_SLEEPING)
{
if (!colObj0->isActive())
{
collisionWorld->getActiveObjects().push_back(colObj0);
}
colObj0->activate();
}
#ifdef SPLIT_ISLANDS