From edbc5a932c102ed7a4cefbc5d4b7b2ab4ce22c02 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Tue, 11 Sep 2007 07:40:18 +0000 Subject: [PATCH] minor fixes for Mac OS X compilation --- Demos/ConcaveDemo/ConcavePhysicsDemo.cpp | 3 ++- Demos/GenericJointDemo/GenericJointDemo.cpp | 2 +- Demos/Jamfile | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp index 12139112b..08aec94fc 100644 --- a/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp +++ b/Demos/ConcaveDemo/ConcavePhysicsDemo.cpp @@ -192,6 +192,7 @@ void ConcaveDemo::initPhysics() bool useQuantizedAabbCompression = true; +//comment out the next line to read the BVH from disk (first run the demo once to create the BVH) #define SERIALIZE_TO_DISK 1 #ifdef SERIALIZE_TO_DISK trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays,useQuantizedAabbCompression); @@ -225,7 +226,7 @@ void ConcaveDemo::initPhysics() fseek(file, 0, SEEK_SET); void* buffer = btAlignedAlloc(size,16); - memset(buffer,0xcc,size); + //memset(buffer,0xcc,size); int read = fread(buffer,1,size,file); fclose(file); bool swapEndian = true; diff --git a/Demos/GenericJointDemo/GenericJointDemo.cpp b/Demos/GenericJointDemo/GenericJointDemo.cpp index 356c308cc..26442e6ac 100644 --- a/Demos/GenericJointDemo/GenericJointDemo.cpp +++ b/Demos/GenericJointDemo/GenericJointDemo.cpp @@ -41,7 +41,7 @@ GLDebugDrawer debugDrawer; int main(int argc,char* argv[]) { GenericJointDemo demoApp; - demoApp.configDebugDrawer(&debugDrawer); +// demoApp.configDebugDrawer(&debugDrawer); demoApp.initPhysics(); demoApp.setCameraDistance(btScalar(10.)); diff --git a/Demos/Jamfile b/Demos/Jamfile index 7497b0aae..afa326717 100644 --- a/Demos/Jamfile +++ b/Demos/Jamfile @@ -47,6 +47,7 @@ SubInclude TOP Demos MovingConcaveDemo ; SubInclude TOP Demos ConcaveDemo ; SubInclude TOP Demos ConstraintDemo ; SubInclude TOP Demos RagdollDemo ; +#SubInclude TOP Demos GenericJointDemo ; SubInclude TOP Demos ContinuousConvexCollision ; SubInclude TOP Demos GjkConvexCastDemo ; SubInclude TOP Demos Raytracer ;