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

Fix interface for comparison/integration files in alternative EPA solvers.

Browse Source
This commit is contained in:
ejcoumans
2007-02-21 21:00:16 +00:00
parent bda1507ea9
commit beb0ace1fc
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/EPA/EpaPenetrationDepthSolver.cpp
View File

@@ -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!" );

2
Extras/EPA/EpaPenetrationDepthSolver.h
View File

@@ -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 :

2
Extras/ExtraSolid35/Solid3EpaPenetrationDepth.cpp
View File

@@ -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
) )
{ {

2
Extras/ExtraSolid35/Solid3EpaPenetrationDepth.h
View File

@@ -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
); );
}; };