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:
ejcoumans
2006-09-27 20:43:51 +00:00
parent d1e9a885f3
commit eb23bb5c0c
263 changed files with 7528 additions and 6714 deletions

View File

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