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

moved more demos into AllBulletDemos

Demos/GimpactTestDemo/GimpactTestDemo.cpp

@@ -383,6 +383,9 @@ btCollisionShape * GimpactConcaveDemo::createBunnyShape()
 //------------------------------------------------------------------------------
 void	GimpactConcaveDemo::initPhysics()
 {
+	gContactAddedCallback = CustomMaterialCombinerCallback;
+
+
 	/// Init Bullet
 	m_collisionConfiguration = new btDefaultCollisionConfiguration();
 

Demos/GimpactTestDemo/GimpactTestDemo.h

@@ -42,7 +42,7 @@ class btDefaultCollisionConfiguration;
 
 
 
-
+class btConstraintSolver;
 struct btCollisionAlgorithmCreateFunc;
 
 ///GimpactConcaveDemo shows usage of static concave triangle meshes
@@ -67,6 +67,8 @@ public:
 
 	virtual ~GimpactConcaveDemo()
 	{
+		delete m_dynamicsWorld;
+
 		delete m_indexVertexArrays;
 		delete m_trimeshShape;
 
@@ -80,7 +82,6 @@ public:
 		delete m_broadphase;
 		delete m_constraintSolver;
 
-		delete m_dynamicsWorld;
 	}
 
 	void	initGImpactCollision();

Demos/GimpactTestDemo/main.cpp

@@ -1,11 +1,10 @@
 
-#include "GimpactConcaveDemo.h"
+#include "GimpactTestDemo.h"
 #include "GlutStuff.h"
 
 //################################## main #####################################
 int main(int argc,char** argv)
 {
-        gContactAddedCallback = CustomMaterialCombinerCallback;
 
         GimpactConcaveDemo* concaveDemo = new GimpactConcaveDemo();  /// This will not be Deleted!!!
         concaveDemo->initPhysics();