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

enable more unit tests in PyBullet.

Browse Source 
return Py_None if no user data found, to pass the test.
enable m_deterministicOverlappingPairs by default.
if m_deterministicOverlappingPairs, sort the collision pairs.
This commit is contained in:
erwincoumans
2018-06-09 12:19:29 -07:00
parent 046a86cd84
commit 0cec85626f
5 changed files with 158 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletCollision/BroadphaseCollision/btDispatcher.h
View File

@@ -47,7 +47,7 @@ struct btDispatcherInfo
m_allowedCcdPenetration(btScalar(0.04)),
m_useConvexConservativeDistanceUtil(false),
m_convexConservativeDistanceThreshold(0.0f),
m_deterministicOverlappingPairs(false)
m_deterministicOverlappingPairs(true)
{
}

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

@@ -252,7 +252,15 @@ void btCollisionDispatcher::dispatchAllCollisionPairs(btOverlappingPairCache* pa
btCollisionPairCallback collisionCallback(dispatchInfo,this);
pairCache->processAllOverlappingPairs(&collisionCallback,dispatcher);
if (dispatchInfo.m_deterministicOverlappingPairs)
{
BT_PROFILE("sortOverlappingPairs");
pairCache->sortOverlappingPairs(this);
}
{
BT_PROFILE("processAllOverlappingPairs");
pairCache->processAllOverlappingPairs(&collisionCallback,dispatcher);
}
//m_blockedForChanges = false;