From beb0ace1fcb4661aeadbb9d2d8fa962e6ffafa0e Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 21 Feb 2007 21:00:16 +0000 Subject: [PATCH] Fix interface for comparison/integration files in alternative EPA solvers. --- Extras/EPA/EpaPenetrationDepthSolver.cpp | 2 +- Extras/EPA/EpaPenetrationDepthSolver.h | 2 +- Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp | 2 +- Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Extras/EPA/EpaPenetrationDepthSolver.cpp b/Extras/EPA/EpaPenetrationDepthSolver.cpp index 1d506d1b0..5d5feeea3 100644 --- a/Extras/EPA/EpaPenetrationDepthSolver.cpp +++ b/Extras/EPA/EpaPenetrationDepthSolver.cpp @@ -43,7 +43,7 @@ bool EpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& simplexS btConvexShape* pConvexA, btConvexShape* pConvexB, const btTransform& transformA, const btTransform& transformB, btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB, - class btIDebugDraw* debugDraw ) + class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc ) { EPA_DEBUG_ASSERT( pConvexA ,"Convex shape A is invalid!" ); EPA_DEBUG_ASSERT( pConvexB ,"Convex shape B is invalid!" ); diff --git a/Extras/EPA/EpaPenetrationDepthSolver.h b/Extras/EPA/EpaPenetrationDepthSolver.h index d281c9761..74c8ea86e 100644 --- a/Extras/EPA/EpaPenetrationDepthSolver.h +++ b/Extras/EPA/EpaPenetrationDepthSolver.h @@ -34,7 +34,7 @@ class EpaPenetrationDepthSolver : public btConvexPenetrationDepthSolver btConvexShape* pConvexA, btConvexShape* pConvexB, const btTransform& transformA, const btTransform& transformB, btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB, - class btIDebugDraw* debugDraw ); + class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc ); private : diff --git a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp index 80b001af9..ea35cda44 100644 --- a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp +++ b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp @@ -321,7 +321,7 @@ bool Solid3EpaPenetrationDepth::calcPenDepth( btSimplexSolverInterface& simplexS btConvexShape* convexA,btConvexShape* convexB, const btTransform& transformA,const btTransform& transformB, btVector3& v, btPoint3& pa, btPoint3& pb, - class btIDebugDraw* debugDraw + class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc ) { diff --git a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h index 501beac27..6727d67a6 100644 --- a/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h +++ b/Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h @@ -36,7 +36,7 @@ public: btConvexShape* convexA,btConvexShape* convexB, const btTransform& transA,const btTransform& transB, btVector3& v, btPoint3& pa, btPoint3& pb, - class btIDebugDraw* debugDraw + class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc ); };