diff --git a/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp b/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp index 012d8645a..b5ce2503f 100644 --- a/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp +++ b/Demos3/GpuDemos/rigidbody/Bullet2FileDemo.cpp @@ -16,16 +16,8 @@ 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"; -#else + //const char* fileName="data/testFile.bullet"; 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 53c32f799..73f990402 100644 --- a/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp +++ b/src/Bullet3OpenCL/NarrowphaseCollision/b3ConvexHullContact.cpp @@ -16,11 +16,7 @@ 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;