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

make sure the btDbvtBroadphase doesn't add/remove any pairs, use the btNullPairCache

Browse Source
This commit is contained in:
erwin.coumans
2008-10-28 05:51:32 +00:00
parent 1ff6420ffb
commit c5112e68e5
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
View File

@@ -96,6 +96,7 @@ protected:
///additional dynamic aabb structure, used to accelerate ray cast queries. ///additional dynamic aabb structure, used to accelerate ray cast queries.
///can be disabled using a optional argument in the constructor ///can be disabled using a optional argument in the constructor
btDbvtBroadphase* m_raycastAccelerator; btDbvtBroadphase* m_raycastAccelerator;
btOverlappingPairCache* m_nullPairCache;
// allocation/deallocation // allocation/deallocation
@@ -338,7 +339,8 @@ m_raycastAccelerator(0)
if (!disableRaycastAccelerator) if (!disableRaycastAccelerator)
{ {
m_raycastAccelerator = new (btAlignedAlloc(sizeof(btDbvtBroadphase),16)) btDbvtBroadphase();//m_pairCache); m_nullPairCache = new (btAlignedAlloc(sizeof(btNullPairCache),16)) btNullPairCache();
m_raycastAccelerator = new (btAlignedAlloc(sizeof(btDbvtBroadphase),16)) btDbvtBroadphase(m_nullPairCache);//m_pairCache);
m_raycastAccelerator->m_deferedcollide = true;//don't add/remove pairs m_raycastAccelerator->m_deferedcollide = true;//don't add/remove pairs
} }
@@ -404,6 +406,8 @@ btAxisSweep3Internal<BP_FP_INT_TYPE>::~btAxisSweep3Internal()
{ {
if (m_raycastAccelerator) if (m_raycastAccelerator)
{ {
m_nullPairCache->~btOverlappingPairCache();
btAlignedFree(m_nullPairCache);
m_raycastAccelerator->~btDbvtBroadphase(); m_raycastAccelerator->~btDbvtBroadphase();
btAlignedFree (m_raycastAccelerator); btAlignedFree (m_raycastAccelerator);
} }