diff --git a/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp b/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp index 37fa801d8..012d8645a 100644 --- a/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp +++ b/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp @@ -16,10 +16,16 @@ Bullet2FileDemo::~Bullet2FileDemo() void Bullet2FileDemo::setupScene(const ConstructionInfo& ci) { b3Assert(ci.m_instancingRenderer); +#ifdef __APPLE__ +//MPR doesn't work yet on Apple, so use a simpler test file +//see bool useMpr at the top of +//src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp - //const char* fileName="data/testFile.bullet"; + + const char* fileName="data/testFile.bullet"; +#else const char* fileName="data/testFileFracture.bullet"; - +#endif FILE* f = 0; const char* prefix[]={"./","../","../../","../../../","../../../../"}; diff --git a/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp b/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp index 811046c87..ff77c059b 100644 --- a/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp +++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp @@ -16,7 +16,11 @@ subject to the following restrictions: bool findSeparatingAxisOnGpu = true; bool splitSearchSepAxisConcave = false; bool splitSearchSepAxisConvex = true; +#ifdef __APPLE__ +bool useMprGpu = false; +#else bool useMprGpu = true;//use mpr for edge-edge (+contact point) or sat. Needs testing on main OpenCL platforms, before enabling... +#endif bool bvhTraversalKernelGPU = true; bool findConcaveSeparatingAxisKernelGPU = true; bool clipConcaveFacesAndFindContactsCPU = false;//false;//true;