updated AllBulletDemo

Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp

@@ -39,7 +39,6 @@ subject to the following restrictions:
 #include <stdio.h> //printf debugging
 #include <vector>
 
-float deltaTime = 1.f/60.f;
 
 #include "ConvexDecompositionDemo.h"
 #include "GL_ShapeDrawer.h"
@@ -48,13 +47,13 @@ float deltaTime = 1.f/60.f;
 
 const int maxNumObjects = 450;
 
-int	shapeIndex[maxNumObjects];
+static int	shapeIndex[maxNumObjects];
 
 btVector3	centroid;
 
 #define CUBE_HALF_EXTENTS 4
 
-btCollisionShape* shapePtr[maxNumObjects];
+static btCollisionShape* shapePtr[maxNumObjects];
 
 
 
@@ -65,24 +64,6 @@ unsigned int tcount = 0;
 
 GLDebugDrawer debugDrawer;
 
-int main(int argc,char** argv)
-{
-	const char* filename = "file.obj";
-
-
-	ConvexDecompositionDemo* convexDecompDemo = new ConvexDecompositionDemo();
-
-	convexDecompDemo->initPhysics(filename);
-
-
-
-	convexDecompDemo->clientResetScene();
-
-	convexDecompDemo->setCameraDistance(26.f);
-
-	return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://www.continuousphysics.com/Bullet/phpBB2/",convexDecompDemo);
-}
-
 void ConvexDecompositionDemo::initPhysics(const char* filename)
 {
 	ConvexDecomposition::WavefrontObj wo;

Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.h

@@ -27,7 +27,14 @@ class ConvexDecompositionDemo : public DemoApplication
 	virtual void clientMoveAndDisplay();
 
 	virtual void displayCallback();
-	
+
+	static DemoApplication* Create()
+	{
+		ConvexDecompositionDemo* demo = new ConvexDecompositionDemo();
+		demo->myinit();
+		demo->initPhysics("file.obj");
+		return demo;
+	}	
 	
 	
 };

Demos/ConvexDecompositionDemo/main.cpp

@@ -0,0 +1,24 @@
+
+
+#include "ConvexDecompositionDemo.h"
+#include "GlutStuff.h"
+
+
+int main(int argc,char** argv)
+{
+        const char* filename = "file.obj";
+
+
+        ConvexDecompositionDemo* convexDecompDemo = new ConvexDecompositionDemo();
+
+        convexDecompDemo->initPhysics(filename);
+
+
+
+        convexDecompDemo->clientResetScene();
+
+        convexDecompDemo->setCameraDistance(26.f);
+
+        return glutmain(argc, argv,640,480,"Bullet Physics Demo. http://www.continuousphysics.com/Bullet/phpBB2/",convexDecompDemo);
+}
+