diff options
Diffstat (limited to 'extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h')
| -rw-r--r-- | extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h index d77d6465d6b..c136e459a32 100644 --- a/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h +++ b/extern/bullet/BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.h @@ -16,18 +16,16 @@ #include "NarrowPhaseCollision/PersistentManifold.h" #include "BroadphaseCollision/BroadphaseProxy.h" #include "NarrowPhaseCollision/VoronoiSimplexSolver.h" -#include "NarrowPhaseCollision/MinkowskiPenetrationDepthSolver.h" - class ConvexPenetrationDepthSolver; ///ConvexConvexAlgorithm collision algorithm implements time of impact, convex closest points and penetration depth calculations. class ConvexConvexAlgorithm : public CollisionAlgorithm { - //hardcoded penetration and simplex solver, its easy to make this flexible later - MinkowskiPenetrationDepthSolver m_penetrationDepthSolver; + ConvexPenetrationDepthSolver* m_penetrationDepthSolver; VoronoiSimplexSolver m_simplexSolver; GjkPairDetector m_gjkPairDetector; + bool m_useEpa; public: BroadphaseProxy m_box0; BroadphaseProxy m_box1; @@ -36,6 +34,8 @@ public: PersistentManifold* m_manifoldPtr; bool m_lowLevelOfDetail; + void CheckPenetrationDepthSolver(); + public: |