merged most of the changes from the branch into trunk, except for COLLADA, libxml and glut glitches.
Still need to verify to make sure no unwanted renaming is introduced.
This commit is contained in:
@@ -21,9 +21,9 @@ subject to the following restrictions:
|
||||
|
||||
///GL_Simplex1to4 is a class to debug a Simplex Solver with 1 to 4 points.
|
||||
///Can be used by GJK.
|
||||
class GL_Simplex1to4 : public BU_Simplex1to4
|
||||
class GL_Simplex1to4 : public btBU_Simplex1to4
|
||||
{
|
||||
SimplexSolverInterface* m_simplexSolver;
|
||||
btSimplexSolverInterface* m_simplexSolver;
|
||||
|
||||
public:
|
||||
|
||||
@@ -31,7 +31,7 @@ class GL_Simplex1to4 : public BU_Simplex1to4
|
||||
|
||||
void CalcClosest(float* m);
|
||||
|
||||
void SetSimplexSolver(SimplexSolverInterface* simplexSolver) {
|
||||
void SetSimplexSolver(btSimplexSolverInterface* simplexSolver) {
|
||||
m_simplexSolver = simplexSolver;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user