mirror of
https://github.com/bulletphysics/bullet3
synced 2024-12-17 06:51:05 +00:00
Fix interface for comparison/integration files in alternative EPA solvers.
This commit is contained in:
parent
bda1507ea9
commit
beb0ace1fc
@ -43,7 +43,7 @@ bool EpaPenetrationDepthSolver::calcPenDepth( btSimplexSolverInterface& simplexS
|
|||||||
btConvexShape* pConvexA, btConvexShape* pConvexB,
|
btConvexShape* pConvexA, btConvexShape* pConvexB,
|
||||||
const btTransform& transformA, const btTransform& transformB,
|
const btTransform& transformA, const btTransform& transformB,
|
||||||
btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
|
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( pConvexA ,"Convex shape A is invalid!" );
|
||||||
EPA_DEBUG_ASSERT( pConvexB ,"Convex shape B is invalid!" );
|
EPA_DEBUG_ASSERT( pConvexB ,"Convex shape B is invalid!" );
|
||||||
|
@ -34,7 +34,7 @@ class EpaPenetrationDepthSolver : public btConvexPenetrationDepthSolver
|
|||||||
btConvexShape* pConvexA, btConvexShape* pConvexB,
|
btConvexShape* pConvexA, btConvexShape* pConvexB,
|
||||||
const btTransform& transformA, const btTransform& transformB,
|
const btTransform& transformA, const btTransform& transformB,
|
||||||
btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
|
btVector3& v, btPoint3& wWitnessOnA, btPoint3& wWitnessOnB,
|
||||||
class btIDebugDraw* debugDraw );
|
class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc );
|
||||||
|
|
||||||
private :
|
private :
|
||||||
|
|
||||||
|
@ -321,7 +321,7 @@ bool Solid3EpaPenetrationDepth::calcPenDepth( btSimplexSolverInterface& simplexS
|
|||||||
btConvexShape* convexA,btConvexShape* convexB,
|
btConvexShape* convexA,btConvexShape* convexB,
|
||||||
const btTransform& transformA,const btTransform& transformB,
|
const btTransform& transformA,const btTransform& transformB,
|
||||||
btVector3& v, btPoint3& pa, btPoint3& pb,
|
btVector3& v, btPoint3& pa, btPoint3& pb,
|
||||||
class btIDebugDraw* debugDraw
|
class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
btConvexShape* convexA,btConvexShape* convexB,
|
btConvexShape* convexA,btConvexShape* convexB,
|
||||||
const btTransform& transA,const btTransform& transB,
|
const btTransform& transA,const btTransform& transB,
|
||||||
btVector3& v, btPoint3& pa, btPoint3& pb,
|
btVector3& v, btPoint3& pa, btPoint3& pb,
|
||||||
class btIDebugDraw* debugDraw
|
class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
|
||||||
);
|
);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user