AuroraMiddleware/bullet3
1
0
Fork 0
mirror of https://github.com/bulletphysics/bullet3 synced 2025-01-10 17:30:12 +00:00
Code Issues Releases Wiki Activity

fixed to get MacOSX to compile, added new files to CMakeLists.txt

Browse Source
This commit is contained in:
ejcoumans 2008-01-23 23:13:31 +00:00
parent 127d911c9d
commit af85183a48
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Demos/ConcaveRaycastDemo/ConcaveRaycastDemo.cpp
View File

@ -156,6 +156,7 @@ public:
{
#ifdef USE_BT_CLOCK
frame_timer.reset ();
#endif //USE_BT_CLOCK
#ifdef BATCH_RAYCASTER
if (!gBatchRaycaster)

8
Extras/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuCollisionShapes.cpp
View File

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

2
src/BulletCollision/CMakeLists.txt
View File

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