fix and re-enable sphere-box collision algorithm, Issue 643

Thanks to Laurent for the fix and Thomas for adapting the fix to latest trunk revision!
This commit is contained in:
erwin.coumans
2012-07-31 17:17:51 +00:00
parent 7f6131f0cc
commit 37ebcc3aa6
5 changed files with 107 additions and 166 deletions

View File

@@ -78,10 +78,8 @@ protected:
btCollisionAlgorithmCreateFunc* m_swappedCompoundCreateFunc;
btCollisionAlgorithmCreateFunc* m_emptyCreateFunc;
btCollisionAlgorithmCreateFunc* m_sphereSphereCF;
#ifdef USE_BUGGY_SPHERE_BOX_ALGORITHM
btCollisionAlgorithmCreateFunc* m_sphereBoxCF;
btCollisionAlgorithmCreateFunc* m_boxSphereCF;
#endif //USE_BUGGY_SPHERE_BOX_ALGORITHM
btCollisionAlgorithmCreateFunc* m_boxBoxCF;
btCollisionAlgorithmCreateFunc* m_sphereTriangleCF;