disable Mpr on Mac OSX (need to split the kernel again...)

This commit is contained in:
Erwin Coumans
2014-01-15 11:24:35 -08:00
parent c91c2d9395
commit b53cc5edb8
2 changed files with 12 additions and 2 deletions

View File

@@ -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[]={"./","../","../../","../../../","../../../../"};

View File

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