From e698b1e22b36c975b38126b3c54d55a8e5d48738 Mon Sep 17 00:00:00 2001
From: Erwin Coumans <erwincoumans@Erwins-MacBook-Pro.local>
Date: Thu, 21 Mar 2013 17:54:14 -0700
Subject: [PATCH] working version on Mac OSX (no compound, but concave/convex)

---
 demo/gpudemo/GpuDemo.h                               | 4 ++--
 demo/gpudemo/main_opengl3core.cpp                    | 1 +
 demo/gpudemo/rigidbody/ConcaveScene.cpp              | 4 +++-
 opencl/gpu_rigidbody/host/btConfig.h                 | 4 ++--
 opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp | 2 +-
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/demo/gpudemo/GpuDemo.h b/demo/gpudemo/GpuDemo.h
index 149807b11..5c30cf015 100644
--- a/demo/gpudemo/GpuDemo.h
+++ b/demo/gpudemo/GpuDemo.h
@@ -37,9 +37,9 @@ public:
                     :useOpenCL(true),
                     preferredOpenCLPlatformIndex(-1),
                     preferredOpenCLDeviceIndex(-1),
-					arraySizeX(30),
+					arraySizeX(10),
 		arraySizeY(10 ),
-		arraySizeZ(30),
+		arraySizeZ(10),
 		m_useConcaveMesh(false),
 		gapX(6.3),
 		gapY(12.0),
diff --git a/demo/gpudemo/main_opengl3core.cpp b/demo/gpudemo/main_opengl3core.cpp
index 7cee56249..bfee4824e 100644
--- a/demo/gpudemo/main_opengl3core.cpp
+++ b/demo/gpudemo/main_opengl3core.cpp
@@ -64,6 +64,7 @@ btAlignedObjectArray<const char*> demoNames;
 int selectedDemo = 0;
 GpuDemo::CreateFunc* allDemos[]=
 {
+	GpuConvexScene::MyCreateFunc,
 	GpuCompoundScene::MyCreateFunc,
 	ConcaveScene::MyCreateFunc,
 	GpuConvexScene::MyCreateFunc,
diff --git a/demo/gpudemo/rigidbody/ConcaveScene.cpp b/demo/gpudemo/rigidbody/ConcaveScene.cpp
index 9e3da202c..be2f72b5b 100644
--- a/demo/gpudemo/rigidbody/ConcaveScene.cpp
+++ b/demo/gpudemo/rigidbody/ConcaveScene.cpp
@@ -193,7 +193,9 @@ void ConcaveScene::setupScene(const ConstructionInfo& ci)
 		btAlignedObjectArray<btVector3> verts;
 		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);
 		}
 	
diff --git a/opencl/gpu_rigidbody/host/btConfig.h b/opencl/gpu_rigidbody/host/btConfig.h
index ff4365004..3f44e410b 100644
--- a/opencl/gpu_rigidbody/host/btConfig.h
+++ b/opencl/gpu_rigidbody/host/btConfig.h
@@ -18,7 +18,7 @@ struct	btConfig
 	int m_maxTriConvexPairCapacity;
 
 	btConfig()
-		:m_maxConvexBodies(32*1024),
+		:m_maxConvexBodies(16*1024),
 		m_maxConvexShapes(8192),
 		m_maxVerticesPerFace(64),
 		m_maxFacesPerShape(64),
@@ -26,7 +26,7 @@ struct	btConfig
 		m_maxConvexIndices(8192),
 		m_maxConvexUniqueEdges(8192),
 		m_maxCompoundChildShapes(8192),
-		m_maxTriConvexPairCapacity(32*1024)
+		m_maxTriConvexPairCapacity(16*1024)
 	{
 		m_maxBroadphasePairs = 16*m_maxConvexBodies;
 	}
diff --git a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp
index f73079a9b..cd2ada66e 100644
--- a/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp
+++ b/opencl/gpu_rigidbody/host/btGpuRigidBodyPipeline.cpp
@@ -229,4 +229,4 @@ int		btGpuRigidBodyPipeline::registerPhysicsInstance(float mass, const float* po
 	*/
 
 	return bodyIndex;
-}
\ No newline at end of file
+}