'Think Different': enabled some demos to compile for OS X -i386

Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp

@@ -13,7 +13,7 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#define USE_PARALLEL_DISPATCHER 1
+//#define USE_PARALLEL_DISPATCHER 1
 
 
 #include "CcdPhysicsEnvironment.h"
@@ -67,7 +67,16 @@ bool createConstraint = true;
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include "GL_ShapeDrawer.h"
 
 #include "GlutStuff.h"
@@ -111,7 +120,7 @@ CollisionShape* shapePtr[numShapes] =
 	///Please don't make the box sizes larger then 1000: the collision detection will be inaccurate.
 	///See http://www.continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=346
 
-#define USE_GROUND_PLANE 1
+//#define USE_GROUND_PLANE 1
 #ifdef USE_GROUND_PLANE
 	new StaticPlaneShape(SimdVector3(0,1,0),10),
 #else

Demos/ColladaDemo/ColladaDemo.cpp

@@ -111,7 +111,14 @@ float bulletSpeed = 40.f;
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GL_ShapeDrawer.h"
 
 #include "GlutStuff.h"

Demos/CollisionDemo/CollisionDemo.cpp

@@ -34,7 +34,14 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GlutStuff.h"
 
 
@@ -202,4 +209,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp

@@ -39,7 +39,14 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GlutStuff.h"
 
 
@@ -199,4 +206,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/ConcaveDemo/ConcavePhysicsDemo.cpp

@@ -40,7 +40,15 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include "GL_ShapeDrawer.h"
 
 #include "GlutStuff.h"
@@ -423,4 +431,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/ConstraintDemo/ConstraintDemo.cpp

@@ -37,7 +37,14 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GL_ShapeDrawer.h"
 
 #include "GlutStuff.h"
@@ -386,4 +393,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp

@@ -40,7 +40,15 @@
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include "GlutStuff.h"
 
 
@@ -307,4 +315,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp

@@ -63,7 +63,14 @@ bool createConstraint = false;//true;
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GL_ShapeDrawer.h"
 
 #include "GlutStuff.h"

Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp

@@ -34,7 +34,14 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GlutStuff.h"
 
 
@@ -185,4 +192,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp

@@ -42,7 +42,14 @@
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GlutStuff.h"
 
 

Demos/OpenGL/GLDebugDrawer.cpp

@@ -5,7 +5,16 @@
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include "BMF_Api.h"
 #include <stdio.h> //printf debugging
 GLDebugDrawer::GLDebugDrawer()

Demos/OpenGL/GL_ShapeDrawer.cpp

@@ -16,7 +16,16 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include "GL_ShapeDrawer.h"
 #include "CollisionShapes/PolyhedralConvexShape.h"
 #include "CollisionShapes/TriangleMeshShape.h"

Demos/OpenGL/GL_Simplex1to4.cpp

@@ -18,7 +18,14 @@ subject to the following restrictions:
 #ifdef WIN32
 #include <windows.h>
 #endif
+
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#else
 #include <GL/gl.h>
+#endif
 #include "SimdTransform.h"
 
 GL_Simplex1to4::GL_Simplex1to4()

Demos/OpenGL/GlutStuff.cpp

@@ -16,7 +16,17 @@ subject to the following restrictions:
 #ifdef WIN32//for glut.h
 #include <windows.h>
 #endif
+
+
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>

Demos/Raytracer/Raytracer.cpp

@@ -23,7 +23,14 @@ Very basic raytracer, rendering into a texture.
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif>
 #include "GlutStuff.h"
 
 #include "NarrowPhaseCollision/VoronoiSimplexSolver.h"

Demos/SimplexDemo/SimplexDemo.cpp

@@ -25,7 +25,14 @@ subject to the following restrictions:
 #ifdef WIN32 //needed for glut.h
 #include <windows.h>
 #endif
+//think different
+#if defined(__APPLE__) && !defined (VMDMESA)
+#include <OpenGL/gl.h>
+#include <OpenGL/glu.h>
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "GlutStuff.h"
 
 
@@ -131,4 +138,4 @@ void clientMouseFunc(int button, int state, int x, int y)
 }
 void	clientMotionFunc(int x,int y)
 {
-}
+}

Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp

@@ -323,7 +323,7 @@ static void DrawAabb(IDebugDraw* debugDrawer,const SimdVector3& from,const SimdV
 
 CcdPhysicsEnvironment::CcdPhysicsEnvironment(Dispatcher* dispatcher,OverlappingPairCache* pairCache)
 :m_scalingPropagated(false),
-m_numIterations(4),
+m_numIterations(10),
 m_numTimeSubSteps(1),
 m_ccdMode(0),
 m_solverType(-1),