diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index cc29e9985..a8f2d4931 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/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 #endif + +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#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 diff --git a/Demos/ColladaDemo/ColladaDemo.cpp b/Demos/ColladaDemo/ColladaDemo.cpp index 4ba6bcd96..7b063ea33 100644 --- a/Demos/ColladaDemo/ColladaDemo.cpp +++ b/Demos/ColladaDemo/ColladaDemo.cpp @@ -111,7 +111,14 @@ float bulletSpeed = 40.f; #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GL_ShapeDrawer.h" #include "GlutStuff.h" diff --git a/Demos/CollisionDemo/CollisionDemo.cpp b/Demos/CollisionDemo/CollisionDemo.cpp index c43fe2182..caf66dabb 100644 --- a/Demos/CollisionDemo/CollisionDemo.cpp +++ b/Demos/CollisionDemo/CollisionDemo.cpp @@ -34,7 +34,14 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GlutStuff.h" @@ -202,4 +209,4 @@ void clientMouseFunc(int button, int state, int x, int y) } void clientMotionFunc(int x,int y) { -} \ No newline at end of file +} diff --git a/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp b/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp index 3535e2eb5..5a85e4619 100644 --- a/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp +++ b/Demos/CollisionInterfaceDemo/CollisionInterfaceDemo.cpp @@ -39,7 +39,14 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GlutStuff.h" @@ -199,4 +206,4 @@ void clientMouseFunc(int button, int state, int x, int y) } void clientMotionFunc(int x,int y) { -} \ No newline at end of file +} diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index 90e0e4d22..16b4ef5d4 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -40,7 +40,15 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#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) { -} \ No newline at end of file +} diff --git a/Demos/ConstraintDemo/ConstraintDemo.cpp b/Demos/ConstraintDemo/ConstraintDemo.cpp index 5057d5149..7fa48d85c 100644 --- a/Demos/ConstraintDemo/ConstraintDemo.cpp +++ b/Demos/ConstraintDemo/ConstraintDemo.cpp @@ -37,7 +37,14 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#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) { -} \ No newline at end of file +} diff --git a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp index 58e6cd125..09475e671 100644 --- a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp +++ b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp @@ -40,7 +40,15 @@ #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif + #include "GlutStuff.h" @@ -307,4 +315,4 @@ void clientMouseFunc(int button, int state, int x, int y) } void clientMotionFunc(int x,int y) { -} \ No newline at end of file +} diff --git a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp index 04fdc073c..d31de53a9 100644 --- a/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp +++ b/Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp @@ -63,7 +63,14 @@ bool createConstraint = false;//true; #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GL_ShapeDrawer.h" #include "GlutStuff.h" diff --git a/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp b/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp index 9f158d3a4..2aad926bb 100644 --- a/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp +++ b/Demos/ConvexHullDistance/ConvexHullDistanceDemo.cpp @@ -34,7 +34,14 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GlutStuff.h" @@ -185,4 +192,4 @@ void clientMouseFunc(int button, int state, int x, int y) void clientMotionFunc(int x,int y) { -} \ No newline at end of file +} diff --git a/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp b/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp index 8691653ae..7f035c569 100644 --- a/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp +++ b/Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp @@ -42,7 +42,14 @@ #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GlutStuff.h" diff --git a/Demos/OpenGL/GLDebugDrawer.cpp b/Demos/OpenGL/GLDebugDrawer.cpp index 8d3bdbfeb..bdeb5c5ed 100644 --- a/Demos/OpenGL/GLDebugDrawer.cpp +++ b/Demos/OpenGL/GLDebugDrawer.cpp @@ -5,7 +5,16 @@ #ifdef WIN32 //needed for glut.h #include #endif + +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif + #include "BMF_Api.h" #include //printf debugging GLDebugDrawer::GLDebugDrawer() diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index 8beb20a85..81b57e215 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -16,7 +16,16 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif + +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif + #include "GL_ShapeDrawer.h" #include "CollisionShapes/PolyhedralConvexShape.h" #include "CollisionShapes/TriangleMeshShape.h" diff --git a/Demos/OpenGL/GL_Simplex1to4.cpp b/Demos/OpenGL/GL_Simplex1to4.cpp index 0d413235b..a67ea8b1b 100644 --- a/Demos/OpenGL/GL_Simplex1to4.cpp +++ b/Demos/OpenGL/GL_Simplex1to4.cpp @@ -18,7 +18,14 @@ subject to the following restrictions: #ifdef WIN32 #include #endif + +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#else #include +#endif #include "SimdTransform.h" GL_Simplex1to4::GL_Simplex1to4() diff --git a/Demos/OpenGL/GlutStuff.cpp b/Demos/OpenGL/GlutStuff.cpp index 171e8e6ab..71fcd570a 100644 --- a/Demos/OpenGL/GlutStuff.cpp +++ b/Demos/OpenGL/GlutStuff.cpp @@ -16,7 +16,17 @@ subject to the following restrictions: #ifdef WIN32//for glut.h #include #endif + + +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif + #include #include #include diff --git a/Demos/Raytracer/Raytracer.cpp b/Demos/Raytracer/Raytracer.cpp index c6578d7e7..d2194706a 100644 --- a/Demos/Raytracer/Raytracer.cpp +++ b/Demos/Raytracer/Raytracer.cpp @@ -23,7 +23,14 @@ Very basic raytracer, rendering into a texture. #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif> #include "GlutStuff.h" #include "NarrowPhaseCollision/VoronoiSimplexSolver.h" diff --git a/Demos/SimplexDemo/SimplexDemo.cpp b/Demos/SimplexDemo/SimplexDemo.cpp index 6ac7f3c13..a5805e0e1 100644 --- a/Demos/SimplexDemo/SimplexDemo.cpp +++ b/Demos/SimplexDemo/SimplexDemo.cpp @@ -25,7 +25,14 @@ subject to the following restrictions: #ifdef WIN32 //needed for glut.h #include #endif +//think different +#if defined(__APPLE__) && !defined (VMDMESA) +#include +#include +#include +#else #include +#endif #include "GlutStuff.h" @@ -131,4 +138,4 @@ void clientMouseFunc(int button, int state, int x, int y) } void clientMotionFunc(int x,int y) { -} \ No newline at end of file +} diff --git a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp b/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp index ece5eb6d6..eec1cca26 100644 --- a/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp +++ b/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),