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

Fix Issue 2644, compile error due to use of removed stack alloc

Browse Source
This commit is contained in:
erwin.coumans
2013-09-10 20:15:52 +00:00
parent 0779a274de
commit d50be40f8e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Demos/EPAPenDepthDemo/PenetrationTestBullet.cpp
View File

@@ -33,7 +33,7 @@
#include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h" #include "BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" #include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h"
#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" #include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h"
#include "LinearMath/btStackAlloc.h"
//We can use the Bullet EPA or sampling penetration depth solver, but comparison might be useful //We can use the Bullet EPA or sampling penetration depth solver, but comparison might be useful
//#define COMPARE_WITH_SOLID35_AND_OTHER_EPA 1 //#define COMPARE_WITH_SOLID35_AND_OTHER_EPA 1
@@ -299,8 +299,7 @@ static float gDepth;
} }
}; };
//2 Mb by default, could be made smaller
btStackAlloc gStackAlloc(1024*1024*2);
static bool TestEPA(const MyConvex& hull0, const MyConvex& hull1) static bool TestEPA(const MyConvex& hull0, const MyConvex& hull1)
{ {
@@ -346,7 +345,7 @@ static bool TestEPA(const MyConvex& hull0, const MyConvex& hull1)
btDiscreteCollisionDetectorInterface::ClosestPointInput input; btDiscreteCollisionDetectorInterface::ClosestPointInput input;
input.m_transformA = hull0.mTransform; input.m_transformA = hull0.mTransform;
input.m_transformB = hull1.mTransform; input.m_transformB = hull1.mTransform;
input.m_stackAlloc = &gStackAlloc;
MyResult output; MyResult output;
GJK.getClosestPoints(input, output, 0); GJK.getClosestPoints(input, output, 0);