From ed342ede3b5c17375a64a6c7e2d613040b5628fd Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Sun, 21 Oct 2007 05:59:16 +0000 Subject: [PATCH] moved FrameWork into Demos folder --- Demos/BasicDemo/BasicDemo.cpp | 1 - Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp | 2 +- Demos/Jamfile | 20 +++++++ Examples/TestBed/FrameWork/Jamfile | 10 +++- Examples/TestBed/FrameWork/TestEntries.cpp | 63 ++++++++++++++++++++ Examples/TestBed/Jamfile | 3 +- Examples/TestBed/Tests/CollisionProcessing.h | 20 ------- Examples/TestBed/Tests/TestEntries.cpp | 2 - Jamfile.in | 1 - 9 files changed, 94 insertions(+), 28 deletions(-) create mode 100644 Examples/TestBed/FrameWork/TestEntries.cpp delete mode 100644 Examples/TestBed/Tests/CollisionProcessing.h diff --git a/Demos/BasicDemo/BasicDemo.cpp b/Demos/BasicDemo/BasicDemo.cpp index 465b0ee19..8aaa7b6e8 100644 --- a/Demos/BasicDemo/BasicDemo.cpp +++ b/Demos/BasicDemo/BasicDemo.cpp @@ -39,7 +39,6 @@ int gNumObjects = 120; #include "GLDebugDrawer.h" #include //printf debugging btScalar deltaTime = btScalar(1./60.); -btScalar gCollisionMargin = btScalar(0.05); #include "BasicDemo.h" #include "GL_ShapeDrawer.h" #include "GlutStuff.h" diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp index d8dee3887..0b2bf9e2e 100644 --- a/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp +++ b/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp @@ -71,7 +71,7 @@ subject to the following restrictions: #include "BMF_Api.h" #include //printf debugging -float gCollisionMargin = 0.05f; +static float gCollisionMargin = 0.05f; #include "CcdPhysicsDemo.h" #include "GL_ShapeDrawer.h" diff --git a/Demos/Jamfile b/Demos/Jamfile index 788d78a05..41199429c 100644 --- a/Demos/Jamfile +++ b/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 ; diff --git a/Examples/TestBed/FrameWork/Jamfile b/Examples/TestBed/FrameWork/Jamfile index 5b369695b..edc3c8732 100644 --- a/Examples/TestBed/FrameWork/Jamfile +++ b/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 + +; diff --git a/Examples/TestBed/FrameWork/TestEntries.cpp b/Examples/TestBed/FrameWork/TestEntries.cpp new file mode 100644 index 000000000..6e06c78e7 --- /dev/null +++ b/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} +}; + diff --git a/Examples/TestBed/Jamfile b/Examples/TestBed/Jamfile index dd46945f5..31d6a3df5 100644 --- a/Examples/TestBed/Jamfile +++ b/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 ; diff --git a/Examples/TestBed/Tests/CollisionProcessing.h b/Examples/TestBed/Tests/CollisionProcessing.h deleted file mode 100644 index 15b41f957..000000000 --- a/Examples/TestBed/Tests/CollisionProcessing.h +++ /dev/null @@ -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 // - diff --git a/Examples/TestBed/Tests/TestEntries.cpp b/Examples/TestBed/Tests/TestEntries.cpp index 53bd792cf..6e06c78e7 100644 --- a/Examples/TestBed/Tests/TestEntries.cpp +++ b/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} }; diff --git a/Jamfile.in b/Jamfile.in index bd1c2dd13..bce24b92c 100644 --- a/Jamfile.in +++ b/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 ] ;