minor cleanup of btgui/demo3 stuff, much more demo cleanup is needed

moved some files in btgui/Bullet3AppSupport
ChWick · Sep 16, 2014 · 07e2dcc · 07e2dcc
1 parent 3240d79
commit 07e2dcc
Show file tree

Hide file tree

Showing 67 changed files with 161 additions and 526 deletions.
diff --git a/Demos/BasicDemo/BasicDemoPhysicsSetup.h b/Demos/BasicDemo/BasicDemoPhysicsSetup.h
@@ -16,7 +16,7 @@ class btBoxShape;
 #include "LinearMath/btAlignedObjectArray.h"
 
 
-#include "../CommonRigidBodySetup.h"
+#include "Bullet3AppSupport/CommonRigidBodySetup.h"
 
 struct BasicDemoPhysicsSetup : public CommonRigidBodySetup
 {

diff --git a/Demos/BasicDemo/CMakeLists.txt b/Demos/BasicDemo/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(GLUT_ROOT ${BULLET_PHYSICS_SOURCE_DIR}/Glut)
 ########################################################
 
 INCLUDE_DIRECTORIES(
-${BULLET_PHYSICS_SOURCE_DIR}/src ../OpenGL
+${BULLET_PHYSICS_SOURCE_DIR}/src ../OpenGL ../../btgui
 ${GLUT_INCLUDE_DIR}
 )
 

diff --git a/Demos/CcdPhysicsDemo/CMakeLists.txt b/Demos/CcdPhysicsDemo/CMakeLists.txt
@@ -14,6 +14,7 @@
 INCLUDE_DIRECTORIES(
 ${BULLET_PHYSICS_SOURCE_DIR}/src 
 ../OpenGL
+../../btgui
 ${GLUT_INCLUDE_DIR}
 )
 
@@ -44,4 +45,4 @@ IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
 			SET_TARGET_PROPERTIES(AppCcdPhysicsDemo PROPERTIES  DEBUG_POSTFIX "_Debug")
 			SET_TARGET_PROPERTIES(AppCcdPhysicsDemo PROPERTIES  MINSIZEREL_POSTFIX "_MinsizeRel")
 			SET_TARGET_PROPERTIES(AppCcdPhysicsDemo PROPERTIES  RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo")
-ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
+ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES)
diff --git a/Demos/CcdPhysicsDemo/CcdPhysicsSetup.h b/Demos/CcdPhysicsDemo/CcdPhysicsSetup.h
@@ -3,7 +3,7 @@
 #define CCD_PHYSICS_SETUP_H
 
 
-#include "../CommonRigidBodySetup.h"
+#include "Bullet3AppSupport/CommonRigidBodySetup.h"
 
 struct CcdPhysicsSetup : public CommonRigidBodySetup
 {

diff --git a/Demos/SerializeDemo/SerializeSetup.h b/Demos/SerializeDemo/SerializeSetup.h
@@ -1,6 +1,6 @@
 #ifndef SERIALIZE_SETUP_H
 #define SERIALIZE_SETUP_H
-#include "../../Demos/CommonRigidBodySetup.h"
+#include "Bullet3AppSupport/CommonRigidBodySetup.h"
 
 class SerializeSetup : public CommonRigidBodySetup
 {

diff --git a/Demos/premake4.lua b/Demos/premake4.lua
@@ -88,15 +88,15 @@ end
 
  createDemos({"HelloWorld"},{"../src"},{"BulletDynamics","BulletCollision","LinearMath"})
 
- createDemos(localdemos,{"../src","OpenGL"},{"OpenGLSupport","BulletDynamics", "BulletCollision", "LinearMath"})
+ createDemos(localdemos,{"../src","OpenGL","../btgui",},{"OpenGLSupport","BulletDynamics", "BulletCollision", "LinearMath"})
 
  createDemos({"ConvexDecompositionDemo"},{"../Extras/HACD","../Extras/ConvexDecomposition","../src","OpenGL"},{"OpenGLSupport","BulletDynamics", "BulletCollision", "LinearMath","HACD","ConvexDecomposition"})
 
  createDemos({"SoftDemo"},{"../src","OpenGL"}, {"OpenGLSupport","BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"})
 
- createDemos({"SerializeDemo"},{"../Extras/Serialize/BulletFileLoader","../Extras/Serialize/BulletWorldImporter","../src","OpenGL"},{"OpenGLSupport","BulletWorldImporter", "BulletFileLoader", "BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"})
+ createDemos({"SerializeDemo"},{"../Extras/Serialize/BulletFileLoader","../Extras/Serialize/BulletWorldImporter","../src","OpenGL","../btgui"},{"OpenGLSupport","BulletWorldImporter", "BulletFileLoader", "BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"})
 
-createDemos({"BulletXmlImportDemo"},{"../Extras/Serialize/BulletFileLoader","../Extras/Serialize/BulletXmlWorldImporter", "../Extras/Serialize/BulletWorldImporter","../src","OpenGL"},{"OpenGLSupport","BulletXmlWorldImporter","BulletWorldImporter", "BulletFileLoader", "BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"})
+createDemos({"BulletXmlImportDemo"},{"../Extras/Serialize/BulletFileLoader","../Extras/Serialize/BulletXmlWorldImporter", "../Extras/Serialize/BulletWorldImporter","../src","OpenGL","btgui"},{"OpenGLSupport","BulletXmlWorldImporter","BulletWorldImporter", "BulletFileLoader", "BulletSoftBody", "BulletDynamics", "BulletCollision", "LinearMath"})
 
 
 include "OpenGL"

diff --git a/Demos3/AllBullet2Demos/BulletDemoEntries.h b/Demos3/AllBullet2Demos/BulletDemoEntries.h
@@ -2,7 +2,7 @@
 #ifndef BULLET_DEMO_ENTRIES_H
 #define BULLET_DEMO_ENTRIES_H
 
-#include "BulletDemoInterface.h"
+#include "Bullet3AppSupport/BulletDemoInterface.h"
 #include "../bullet2/BasicDemo/BasicDemo.h"
 #include "../bullet2/BasicDemo/HingeDemo.h"
 #include "../bullet2/BasicDemo/HingeDemo.h"

diff --git a/Demos3/AllBullet2Demos/CMakeLists.txt b/Demos3/AllBullet2Demos/CMakeLists.txt
@@ -8,19 +8,7 @@ INCLUDE_DIRECTORIES(
 
 SET(App_AllBullet2Demos_SRCS
 	main.cpp
-	BulletDemoInterface.h
 	BulletDemoEntries.h
-	GwenParameterInterface.cpp
-	GwenParameterInterface.h
-	GraphingTexture.h
-        GwenParameterInterface.h    
-	GwenProfileWindow.h         
-	GwenTextureWindow.h         
-	GraphingTexture.cpp         
-	GwenProfileWindow.cpp 
-	GwenTextureWindow.cpp
-	../bullet2/BasicDemo/Bullet2RigidBodyDemo.cpp
-	../bullet2/BasicDemo/Bullet2RigidBodyDemo.h
 	../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp
 	../../Demos/BasicDemo/BasicDemoPhysicsSetup.h
 	../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp
@@ -51,16 +39,14 @@ SET(App_AllBullet2Demos_SRCS
 #	../bullet2/RagdollDemo/RagdollDemo.h
 	../bullet2/LuaDemo/LuaPhysicsSetup.cpp
 	../bullet2/LuaDemo/LuaPhysicsSetup.h
-	../GpuDemos/gwenUserInterface.cpp
-	../GpuDemos/gwenUserInterface.h
 	../ImportURDFDemo/ImportURDFSetup.cpp
 	../ImportURDFDemo/ImportURDFSetup.h
 	../ImportObjDemo/ImportObjSetup.cpp
 	 	../ImportSTLDemo/ImportSTLSetup.cpp
 		../Wavefront/tiny_obj_loader.cpp
 		../Wavefront/tiny_obj_loader.h
-	../../btgui/Timing/b3Clock.cpp
-	../../btgui/Timing/b3Clock.h
+	../../btgui/Bullet3AppSupport/b3Clock.cpp
+	../../btgui/Bullet3AppSupport/b3Clock.h
         ../../btgui/urdf/urdfdom/urdf_parser/src/pose.cpp
                         ../../btgui/urdf/urdfdom/urdf_parser/src/model.cpp
                         ../../btgui/urdf/urdfdom/urdf_parser/src/link.cpp
@@ -85,7 +71,7 @@ SET(App_AllBullet2Demos_SRCS
 )
 
 LINK_LIBRARIES(
-        lua-5.2.3 Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
+        Bullet3AppSupport lua-5.2.3 Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY}
 )
 
 IF (WIN32)

diff --git a/Demos3/AllBullet2Demos/main.cpp b/Demos3/AllBullet2Demos/main.cpp
@@ -1,16 +1,16 @@
 
-#include "../../btgui/OpenGLWindow/SimpleOpenGL3App.h"
+#include "OpenGLWindow/SimpleOpenGL3App.h"
 #include "Bullet3Common/b3Vector3.h"
 #include "assert.h"
 #include <stdio.h>
-#include "../GpuDemos/gwenInternalData.h"
-#include "../GpuDemos/gwenUserInterface.h"
+#include "Bullet3AppSupport/gwenInternalData.h"
+#include "Bullet3AppSupport/gwenUserInterface.h"
 #include "BulletDemoEntries.h"
-#include "../../btgui/Timing/b3Clock.h"
-#include "GwenParameterInterface.h"
-#include "GwenProfileWindow.h"
-#include "GwenTextureWindow.h"
-#include "GraphingTexture.h"
+#include "Bullet3AppSupport/b3Clock.h"
+#include "Bullet3AppSupport/GwenParameterInterface.h"
+#include "Bullet3AppSupport/GwenProfileWindow.h"
+#include "Bullet3AppSupport/GwenTextureWindow.h"
+#include "Bullet3AppSupport/GraphingTexture.h"
 
 
 #define DEMO_SELECTION_COMBOBOX 13

diff --git a/Demos3/AllBullet2Demos/premake4.lua b/Demos3/AllBullet2Demos/premake4.lua
@@ -13,7 +13,7 @@
                 }
 
 
-		links{"gwen", "OpenGL_Window","BulletDynamics","BulletCollision","LinearMath","Bullet3Common","lua-5.2.3"}
+		links{"Bullet3AppSupport","gwen", "OpenGL_Window","BulletDynamics","BulletCollision","LinearMath","Bullet3Common","lua-5.2.3"}
 		initOpenGL()
 		initGlew()
 
@@ -39,8 +39,6 @@
 		files {
 		"**.cpp",
 		"**.h",
-		"../bullet2/BasicDemo/Bullet2RigidBodyDemo.cpp",
-		"../bullet2/BasicDemo/Bullet2RigidBodyDemo.h",
 		"../bullet2/LuaDemo/LuaPhysicsSetup.cpp",
 		"../bullet2/LuaDemo/LuaPhysicsSetup.h",
 		"../bullet2/MultiBodyDemo/TestJointTorqueSetup.cpp",
@@ -102,10 +100,6 @@
 --		"../bullet2/LuaDemo/LuaDemo.h",
 
 
-		"../../btgui/Timing/b3Clock.cpp",
-		"../../btgui/Timing/b3Clock.h",
-		"../GpuDemos/gwenUserInterface.cpp",
-		"../GpuDemos/gwenUserInterface.h"
 		}
 
 if os.is("Linux") then 

diff --git a/Demos3/BasicDemoConsole/premake4.lua b/Demos3/BasicDemoConsole/premake4.lua
@@ -3,7 +3,7 @@ project "App_BasicDemoConsole"
 		kind "ConsoleApp"
 		targetdir "../../bin"
 
-	  includedirs {"../../src"}
+	  includedirs {"../../src","../../btgui"}
 		configuration { "Windows" }
 --	 		links { "opengl32","glu32","gdi32","winmm", "user32" }
 	 		files   { "../../build3/bullet.rc" }