From af85183a482dfdf00bed1cd0b127a70c6ae52f6b Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Wed, 23 Jan 2008 23:13:31 +0000 Subject: [PATCH] fixed to get MacOSX to compile, added new files to CMakeLists.txt --- Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp | 1 + .../SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp | 8 +++++--- src/BulletCollision/CMakeLists.txt | 2 ++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp index 0ab38f4d5..83ef2c218 100644 --- a/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp +++ b/Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp @@ -156,6 +156,7 @@ public: { #ifdef USE_BT_CLOCK frame_timer.reset (); +#endif //USE_BT_CLOCK #ifdef BATCH_RAYCASTER if (!gBatchRaycaster) diff --git a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp index a190ec7f1..c7386f5d3 100644 --- a/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp +++ b/Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp @@ -210,7 +210,7 @@ btPoint3 localGetSupportingVertexWithoutMargin(int shapeType, void* shape, btVec #if __ASSERT - spu_printf("localGetSupportingVertexWithoutMargin() - Unsupported bound type: %d.\n", shapeType); + // spu_printf("localGetSupportingVertexWithoutMargin() - Unsupported bound type: %d.\n", shapeType); #endif // __ASSERT return btPoint3(0.f, 0.f, 0.f); } @@ -277,7 +277,9 @@ void computeAabb (btVector3& aabbMin, btVector3& aabbMax, btConvexInternalShape* break; } default: - spu_printf("SPU: unsupported shapetype %d in AABB calculation\n"); + { + // spu_printf("SPU: unsupported shapetype %d in AABB calculation\n"); + } }; } @@ -383,7 +385,7 @@ void dmaConvexVertexData (SpuConvexPolyhedronVertexData* convexVertexData, btCon if (convexVertexData->gNumConvexPoints>MAX_NUM_SPU_CONVEX_POINTS) { btAssert(0); - spu_printf("SPU: Error: MAX_NUM_SPU_CONVEX_POINTS(%d) exceeded: %d\n",MAX_NUM_SPU_CONVEX_POINTS,convexVertexData->gNumConvexPoints); + // spu_printf("SPU: Error: MAX_NUM_SPU_CONVEX_POINTS(%d) exceeded: %d\n",MAX_NUM_SPU_CONVEX_POINTS,convexVertexData->gNumConvexPoints); return; } diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index a8ada5837..b8df4c1ba 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -89,6 +89,8 @@ ADD_LIBRARY(LibBulletCollision CollisionShapes/btPolyhedralConvexShape.h CollisionShapes/btTetrahedronShape.cpp CollisionShapes/btTetrahedronShape.h + CollisionShapes/btShapeHull.h + CollisionShapes/btShapeHull.cpp CollisionShapes/btSphereShape.cpp CollisionShapes/btSphereShape.h CollisionShapes/btStaticPlaneShape.cpp