moved FrameWork into Demos folder

Demos/BasicDemo/BasicDemo.cpp

@@ -39,7 +39,6 @@ int gNumObjects = 120;
 #include "GLDebugDrawer.h"
 #include <stdio.h> //printf debugging
 btScalar deltaTime = btScalar(1./60.);
-btScalar gCollisionMargin = btScalar(0.05);
 #include "BasicDemo.h"
 #include "GL_ShapeDrawer.h"
 #include "GlutStuff.h"

Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp

@@ -71,7 +71,7 @@ subject to the following restrictions:
 #include "BMF_Api.h"
 #include <stdio.h> //printf debugging
 
-float	gCollisionMargin = 0.05f;
+static float	gCollisionMargin = 0.05f;
 #include "CcdPhysicsDemo.h"
 #include "GL_ShapeDrawer.h"
 

Demos/Jamfile

@@ -29,7 +29,27 @@ if $(GLUT.AVAILABLE) = "yes"
         "../../src" ;
   }
 
+if $(GLUT.AVAILABLE) = "yes"
+{
+  # All demo apps have a lot in common, so use this rule to simply things
+  rule FrameWorkDemo
+  {
+    Application $(<) : $(>) : noinstall console nomanifest ;
+    LinkWith $(<) :   bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ;
+    CFlags $(<) :
+          [ FIncludes $(TOP)/Extras ]
+         [ FIncludes $(TOP)/Demos/OpenGL ]
+    ;
+    MsvcIncDirs $(<) :
+        "../../Extras"
+        "../../src"
+        "../../Demos/OpenGL"
+;
 
+  }
+}
+
+SubInclude TOP Demos AllBulletDemos ;
 SubInclude TOP Demos CcdPhysicsDemo ;
 SubInclude TOP Demos UserCollisionAlgorithm ;
 #SubInclude TOP Demos ForkLiftDemo ;

Examples/TestBed/FrameWork/Jamfile

@@ -1,3 +1,11 @@
 SubDir TOP Examples TestBed FrameWork ;
 
-FrameWorkDemo AllBulletDemos : [ Wildcard *.h *.cpp  ] ;
+FrameWorkDemo AllBulletDemos : 
+[ Wildcard *.h *.cpp  ] 
+	../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
+        ../../../Demos/BasicDemo/BasicDemo.cpp
+        ../../../Demos/BspDemo/BspDemo.cpp
+        ../../../Demos/BspDemo/BspConverter.cpp
+        ../../../Demos/BspDemo/BspLoader.cpp
+
+;

Examples/TestBed/FrameWork/TestEntries.cpp

@@ -0,0 +1,63 @@
+
+
+#include "../FrameWork/Test.h"
+
+#include "../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h"
+
+class CcdPhysicsTest : public Test
+{
+	CcdPhysicsDemo*	m_demo;
+	CcdPhysicsTest()
+	{
+		m_demo = new CcdPhysicsDemo();
+		m_demo->initPhysics();
+	}
+	virtual ~CcdPhysicsTest()
+	{
+		delete m_demo;
+	}
+public:
+	void Step(const Settings* settings)
+	{
+		m_demo->clientMoveAndDisplay();
+	}
+	static Test* Create()
+	{
+		return new CcdPhysicsTest;
+	}
+};
+
+#include "../../../Demos/BspDemo/BspDemo.h"
+
+class BspDemoTest : public Test
+{
+	BspDemo*	m_demo;
+
+	BspDemoTest()
+	{
+		m_demo = new BspDemo();
+		m_demo->initPhysics("BspDemo.bsp");
+	}
+	virtual ~BspDemoTest()
+	{
+		delete m_demo;
+	}
+public:
+	void Step(const Settings* settings)
+	{
+		m_demo->clientMoveAndDisplay();
+	}
+	static Test* Create()
+	{
+		return new BspDemoTest;
+	}
+};
+
+
+TestEntry g_testEntries[] =
+{
+		{"CcdPhysics Test", CcdPhysicsTest::Create},
+		{"BspDemo Test", BspDemoTest::Create},
+		{0, 0}
+};
+

Examples/TestBed/Jamfile

@@ -6,7 +6,7 @@ if $(GLUT.AVAILABLE) = "yes"
   rule FrameWorkDemo
   {
     Application $(<) : $(>) : noinstall console nomanifest ;
-    LinkWith $(<) :  Tests bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ;
+    LinkWith $(<) :   bulletopenglsupport bulletdynamics bulletcollision bulletmath glui ;
     CFlags $(<) : 
 	  [ FIncludes $(TOP)/Extras ] 
 	 [ FIncludes $(TOP)/Demos/OpenGL ]
@@ -22,4 +22,3 @@ if $(GLUT.AVAILABLE) = "yes"
 
 
 SubInclude TOP Examples TestBed FrameWork ;
-SubInclude TOP Examples TestBed Tests ;

Examples/TestBed/Tests/CollisionProcessing.h

@@ -1,20 +0,0 @@
-#ifndef COLLISION_PROCESSING_H
-#define COLLISION_PROCESSING_H
-
-#include "../FrameWork/Test.h"
-
-class CollisionProcessing : public Test
-{
-public:
-void Step(const Settings* settings)
-{
-
-}
-static Test* Create()
-{
-return new CollisionProcessing;
-}
-};
-
-#endif //
-

Examples/TestBed/Tests/TestEntries.cpp

@@ -1,7 +1,6 @@
 
 
 #include "../FrameWork/Test.h"
-#include "CollisionProcessing.h"
 
 #include "../../../Demos/CcdPhysicsDemo/CcdPhysicsDemo.h"
 
@@ -59,7 +58,6 @@ TestEntry g_testEntries[] =
 {
 		{"CcdPhysics Test", CcdPhysicsTest::Create},
 		{"BspDemo Test", BspDemoTest::Create},
-        {"Collision Processing", CollisionProcessing::Create},
 		{0, 0}
 };
 

Jamfile.in

@@ -61,7 +61,6 @@ MsvcGenConfig GLEW.LIBS : glew32.lib ;
 
 SubInclude TOP src ;
 SubInclude TOP Extras ;
-SubInclude TOP Examples ;
 SubInclude TOP Demos ;
 
 Depends install_config : [ DoInstall bullet.pc : $(libdir)/pkgconfig ] ;