working version on Mac OSX (no compound, but concave/convex)
This commit is contained in:
@@ -37,9 +37,9 @@ public:
|
|||||||
:useOpenCL(true),
|
:useOpenCL(true),
|
||||||
preferredOpenCLPlatformIndex(-1),
|
preferredOpenCLPlatformIndex(-1),
|
||||||
preferredOpenCLDeviceIndex(-1),
|
preferredOpenCLDeviceIndex(-1),
|
||||||
arraySizeX(30),
|
arraySizeX(10),
|
||||||
arraySizeY(10 ),
|
arraySizeY(10 ),
|
||||||
arraySizeZ(30),
|
arraySizeZ(10),
|
||||||
m_useConcaveMesh(false),
|
m_useConcaveMesh(false),
|
||||||
gapX(6.3),
|
gapX(6.3),
|
||||||
gapY(12.0),
|
gapY(12.0),
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ btAlignedObjectArray<const char*> demoNames;
|
|||||||
int selectedDemo = 0;
|
int selectedDemo = 0;
|
||||||
GpuDemo::CreateFunc* allDemos[]=
|
GpuDemo::CreateFunc* allDemos[]=
|
||||||
{
|
{
|
||||||
|
GpuConvexScene::MyCreateFunc,
|
||||||
GpuCompoundScene::MyCreateFunc,
|
GpuCompoundScene::MyCreateFunc,
|
||||||
ConcaveScene::MyCreateFunc,
|
ConcaveScene::MyCreateFunc,
|
||||||
GpuConvexScene::MyCreateFunc,
|
GpuConvexScene::MyCreateFunc,
|
||||||
|
|||||||
@@ -193,7 +193,9 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
|
|||||||
btAlignedObjectArray<btVector3> verts;
|
btAlignedObjectArray<btVector3> verts;
|
||||||
for (int i=0;i<shape->m_numvertices;i++)
|
for (int i=0;i<shape->m_numvertices;i++)
|
||||||
{
|
{
|
||||||
btVector3 vtx = (btVector3&)shape->m_vertices->at(i).xyzw;
|
btVector3 vtx(shape->m_vertices->at(i).xyzw[0],
|
||||||
|
shape->m_vertices->at(i).xyzw[1],
|
||||||
|
shape->m_vertices->at(i).xyzw[2]);
|
||||||
verts.push_back(vtx*scaling);
|
verts.push_back(vtx*scaling);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ struct btConfig
|
|||||||
int m_maxTriConvexPairCapacity;
|
int m_maxTriConvexPairCapacity;
|
||||||
|
|
||||||
btConfig()
|
btConfig()
|
||||||
:m_maxConvexBodies(32*1024),
|
:m_maxConvexBodies(16*1024),
|
||||||
m_maxConvexShapes(8192),
|
m_maxConvexShapes(8192),
|
||||||
m_maxVerticesPerFace(64),
|
m_maxVerticesPerFace(64),
|
||||||
m_maxFacesPerShape(64),
|
m_maxFacesPerShape(64),
|
||||||
@@ -26,7 +26,7 @@ struct btConfig
|
|||||||
m_maxConvexIndices(8192),
|
m_maxConvexIndices(8192),
|
||||||
m_maxConvexUniqueEdges(8192),
|
m_maxConvexUniqueEdges(8192),
|
||||||
m_maxCompoundChildShapes(8192),
|
m_maxCompoundChildShapes(8192),
|
||||||
m_maxTriConvexPairCapacity(32*1024)
|
m_maxTriConvexPairCapacity(16*1024)
|
||||||
{
|
{
|
||||||
m_maxBroadphasePairs = 16*m_maxConvexBodies;
|
m_maxBroadphasePairs = 16*m_maxConvexBodies;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -229,4 +229,4 @@ int btGpuRigidBodyPipeline::registerPhysicsInstance(float mass, const float* po
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
return bodyIndex;
|
return bodyIndex;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user