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

Merge pull request #1535 from CuriousRubick/rubyBullet

Browse Source 
no need to keep iterating if an object is found awake or unable to sleep
This commit is contained in:
erwincoumans
2018-01-26 11:56:47 -08:00
committed by GitHub
parent 0ce40b70c0 ecfdd07f19
commit 90e06c7fc7
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,13 +261,11 @@ void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisio
btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1)); btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
if (colObj0->getIslandTag() == islandId) if (colObj0->getIslandTag() == islandId)
{ {
if (colObj0->getActivationState()== ACTIVE_TAG) if (colObj0->getActivationState()== ACTIVE_TAG ||
{ colObj0->getActivationState()== DISABLE_DEACTIVATION)
allSleeping = false;
}
if (colObj0->getActivationState()== DISABLE_DEACTIVATION)
{ {
allSleeping = false; allSleeping = false;
break;
} }
} }
} }

8
src/BulletDynamics/Dynamics/btSimulationIslandManagerMt.cpp
View File

@@ -314,13 +314,11 @@ void btSimulationIslandManagerMt::buildIslands( btDispatcher* dispatcher, btColl
btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1)); btAssert((colObj0->getIslandTag() == islandId) || (colObj0->getIslandTag() == -1));
if (colObj0->getIslandTag() == islandId) if (colObj0->getIslandTag() == islandId)
{ {
if (colObj0->getActivationState()== ACTIVE_TAG) if (colObj0->getActivationState()== ACTIVE_TAG ||
{ colObj0->getActivationState()== DISABLE_DEACTIVATION)
allSleeping = false;
}
if (colObj0->getActivationState()== DISABLE_DEACTIVATION)
{ {
allSleeping = false; allSleeping = false;
break;
} }
} }
} }