added btGetVersion(), return integer without the fraction: for example 2.64 returns 264.

moved more demos into AllBulletDemos

3 files changed, 25 insertions, 15 deletions

diff --git a/Demos/VehicleDemo/VehicleDemo.cpp b/Demos/VehicleDemo/VehicleDemo.cpp
index 065d05d97..67db2bd41 100644
--- a/Demos/VehicleDemo/VehicleDemo.cpp
+++ b/Demos/VehicleDemo/VehicleDemo.cpp
@@ -83,17 +83,6 @@ btScalar suspensionRestLength(0.6);
 

 

 

-GLDebugDrawer debugDrawer;

-

-int main(int argc,char** argv)

-{

-

-	VehicleDemo* vehicleDemo = new VehicleDemo;

-

-	vehicleDemo->setupPhysics();

-

-	return glutmain(argc, argv,640,480,"Bullet Vehicle Demo. http://www.continuousphysics.com/Bullet/phpBB2/", vehicleDemo);

-}

 

 VehicleDemo::VehicleDemo()

 :

@@ -106,7 +95,7 @@ m_maxCameraDistance(10.f)
 	m_cameraPosition = btVector3(30,30,30);

 }

 

-void VehicleDemo::setupPhysics()

+void VehicleDemo::initPhysics()

 {

 

 	extern btScalar	gJitterVelocityDampingFactor;

@@ -128,7 +117,6 @@ void VehicleDemo::setupPhysics()
 #ifdef FORCE_ZAXIS_UP

 	m_dynamicsWorld->setGravity(btVector3(0,0,-10));

 #endif 

-	m_dynamicsWorld->setDebugDrawer(&debugDrawer);

 

 	//m_dynamicsWorld->setGravity(btVector3(0,0,0));

 btTransform tr;

@@ -361,7 +349,6 @@ void VehicleDemo::renderme()
 	

 	updateCamera();

 

-	debugDrawer.setDebugMode(getDebugMode());

 	btScalar m[16];

 	int i;

 

diff --git a/Demos/VehicleDemo/VehicleDemo.h b/Demos/VehicleDemo/VehicleDemo.h
index e930de727..9845a816e 100644
--- a/Demos/VehicleDemo/VehicleDemo.h
+++ b/Demos/VehicleDemo/VehicleDemo.h
@@ -55,7 +55,15 @@ class VehicleDemo : public DemoApplication
 

 	void renderme();

 

-	void setupPhysics();

+	void initPhysics();

+

+	static DemoApplication* Create()

+	{

+		VehicleDemo* demo = new VehicleDemo();

+		demo->myinit();

+		demo->initPhysics();

+		return demo;

+	}

 };

 

 #endif //VEHICLE_DEMO_H

diff --git a/Demos/VehicleDemo/main.cpp b/Demos/VehicleDemo/main.cpp
new file mode 100644
index 000000000..d5814a30c
--- /dev/null
+++ b/Demos/VehicleDemo/main.cpp
@@ -0,0 +1,15 @@
+
+#include "VehicleDemo.h"
+#include "GlutStuff.h"
+
+
+int main(int argc,char** argv)
+{
+
+        VehicleDemo* vehicleDemo = new VehicleDemo;
+
+        vehicleDemo->initPhysics(); 
+
+        return glutmain(argc, argv,640,480,"Bullet Vehicle Demo. http://www.continuousphysics.com/Bullet/phpBB2/", vehicleDemo);
+}
+