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

don't use multisap yet in basic demo.

Browse Source 
fix crash in multi sap (due to new pair manager)
This commit is contained in:
ejcoumans
2007-10-11 03:32:37 +00:00
parent 0405ce278a
commit 52eb5fa1a4
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Demos/BasicDemo/BasicDemo.cpp
View File

@@ -14,7 +14,7 @@ subject to the following restrictions:
*/ */
//#define USE_GROUND_BOX 1 #define USE_GROUND_BOX 1
//#define PRINT_CONTACT_STATISTICS 1 //#define PRINT_CONTACT_STATISTICS 1
//#define CHECK_MEMORY_LEAKS 1 //#define CHECK_MEMORY_LEAKS 1
//#define USE_PARALLEL_DISPATCHER 1 //#define USE_PARALLEL_DISPATCHER 1
@@ -160,8 +160,8 @@ void BasicDemo::initPhysics()
#define maxProxies 8192 #define maxProxies 8192
btVector3 worldAabbMin(-10000,-10000,-10000); btVector3 worldAabbMin(-10000,-10000,-10000);
btVector3 worldAabbMax(10000,10000,10000); btVector3 worldAabbMax(10000,10000,10000);
//m_overlappingPairCache = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies); m_overlappingPairCache = new btAxisSweep3(worldAabbMin,worldAabbMax,maxProxies);
m_overlappingPairCache = new btMultiSapBroadphase();
#else #else

4
src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
View File

@@ -103,6 +103,8 @@ void btMultiSapBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
btBroadphasePairArray& overlappingPairArray = m_overlappingPairs->getOverlappingPairArray(); btBroadphasePairArray& overlappingPairArray = m_overlappingPairs->getOverlappingPairArray();
#ifndef USE_HASH_PAIRCACHE
//perform a sort, to find duplicates and to sort 'invalid' pairs to the end //perform a sort, to find duplicates and to sort 'invalid' pairs to the end
overlappingPairArray.heapSort(btBroadphasePairSortPredicate()); overlappingPairArray.heapSort(btBroadphasePairSortPredicate());
@@ -172,6 +174,8 @@ void btMultiSapBroadphase::calculateOverlappingPairs(btDispatcher* dispatcher)
m_invalidPair = 0; m_invalidPair = 0;
#endif//CLEAN_INVALID_PAIRS #endif//CLEAN_INVALID_PAIRS
#endif //USE_HASH_PAIRCACHE
} }