From ad8f705bcbd264c52c43693bce602f7c3ef06f08 Mon Sep 17 00:00:00 2001 From: erwincoumans Date: Thu, 16 Apr 2015 22:14:27 -0700 Subject: [PATCH] more cmake support for examples --- examples/CMakeLists.txt | 2 +- examples/ExampleBrowser/CMakeLists.txt | 189 ++++++++++---------- examples/ExampleBrowser/ExampleEntries.cpp | 46 +++-- examples/HelloWorld/CMakeLists.txt | 10 +- examples/HelloWorld/HelloWorld.cpp | 11 +- examples/OpenGLWindow/CMakeLists.txt | 8 +- examples/OpenGLWindow/Win32Window.cpp | 2 +- examples/OpenGLWindow/Win32Window.h | 4 +- examples/ThirdPartyLibs/Gwen/CMakeLists.txt | 5 +- 9 files changed, 152 insertions(+), 125 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index b0e3c88dd..a16e3da58 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1 +1 @@ -SUBDIRS( HelloWorld BasicDemo ) \ No newline at end of file +SUBDIRS( ExampleBrowser HelloWorld BasicDemo ThirdPartyLibs/gwen OpenGLWindow) \ No newline at end of file diff --git a/examples/ExampleBrowser/CMakeLists.txt b/examples/ExampleBrowser/CMakeLists.txt index 5e3a7c5b9..acede97b4 100644 --- a/examples/ExampleBrowser/CMakeLists.txt +++ b/examples/ExampleBrowser/CMakeLists.txt @@ -1,103 +1,108 @@ INCLUDE_DIRECTORIES( + . ${BULLET_PHYSICS_SOURCE_DIR}/src - ${BULLET_PHYSICS_SOURCE_DIR}/btgui - ${BULLET_PHYSICS_SOURCE_DIR}/btgui/lua-5.2.3/src - ${BULLET_PHYSICS_SOURCE_DIR}/Demos3/FiniteElementMethod + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs ) -SET(App_AllBullet2Demos_SRCS +FILE(GLOB ExampleBrowser_SRCS "*" "GwenGUISupport/*" ) +FILE(GLOB ExampleBrowser_HDRS "*" "GwenGUISupport/*" ) + + + +SET(App_ExampleBrowser_SRCS main.cpp - BulletDemoEntries.h - ../../Demos/BasicDemo/BasicDemoPhysicsSetup.cpp - ../../Demos/BasicDemo/BasicDemoPhysicsSetup.h - ../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.cpp - ../../Demos/CcdPhysicsDemo/CcdPhysicsSetup.h - ../../Demos/Raytracer/RaytracerSetup.cpp - ../../Demos/Raytracer/RaytracerSetup.h - ../../Demos/GyroscopicDemo/GyroscopicSetup.cpp - ../../Demos/GyroscopicDemo/GyroscopicSetup.h - ../../Demos/ForkLiftDemo/ForkLiftPhysicsSetup.cpp - ../../Demos/ForkLiftDemo/ForkLiftPhysicsSetup.h - ../../Demos/SerializeDemo/SerializeSetup.cpp - ../../Extras/Serialize/BulletFileLoader/bChunk.cpp - ../../Extras/Serialize/BulletFileLoader/bDNA.cpp - ../../Extras/Serialize/BulletFileLoader/bFile.cpp - ../../Extras/Serialize/BulletFileLoader/btBulletFile.cpp - ../../Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp - ../../Extras/Serialize/BulletWorldImporter/btWorldImporter.cpp - ../bullet2/MultiBodyDemo/TestJointTorqueSetup.cpp - ../bullet2/MultiBodyDemo/MultiBodyVehicle.cpp - ../bullet2/ConstraintDemo/ConstraintPhysicsSetup.cpp - ../bullet2/ConstraintDemo/ConstraintPhysicsSetup.h - ../bullet2/ConstraintDemo/Dof6Spring2Setup.cpp - ../bullet2/ConstraintDemo/Dof6Spring2Setup.h - ../bullet2/CoordinateFrameDemo/CoordinateFrameDemoPhysicsSetup.cpp - ../bullet2/CoordinateFrameDemo/CoordinateFrameDemoPhysicsSetup.h - ../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.cpp - ../bullet2/FeatherstoneMultiBodyDemo/BulletMultiBodyDemos.h - ../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.cpp - ../bullet2/FeatherstoneMultiBodyDemo/MultiDofDemo.h - ../bullet2/BasicDemo/BasicDemo.cpp - ../bullet2/BasicDemo/BasicDemo.h -# ../bullet2/SoftDemo/SoftDemo.cpp -# the next few demos are not converted to 'newer' structure yet -# target is to convert all Bullet 2 demos in new structure but need to settle down on features -# ../bullet2/BasicDemo/HingeDemo.cpp -# ../bullet2/BasicDemo/HingeDemo.h -# ../bullet2/ChainDemo/ChainDemo.cpp -# ../bullet2/ChainDemo/ChainDemo.h -# ../bullet2/RagdollDemo/RagdollDemo.cpp -# ../bullet2/RagdollDemo/RagdollDemo.h - ../bullet2/LuaDemo/LuaPhysicsSetup.cpp - ../bullet2/LuaDemo/LuaPhysicsSetup.h - ../ImportURDFDemo/URDF2Bullet.cpp - ../ImportURDFDemo/ImportURDFSetup.cpp - ../ImportURDFDemo/ImportURDFSetup.h - ../ImportObjDemo/ImportObjSetup.cpp - ../ImportObjDemo/LoadMeshFromObj.cpp - ../ImportObjDemo/LoadMeshFromObj.h - ../ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp - ../ImportColladaDemo/ImportColladaSetup.cpp - ../ImportColladaDemo/LoadMeshFromCollada.cpp - ../ImportSTLDemo/ImportSTLSetup.cpp - ../Wavefront/tiny_obj_loader.cpp - ../Wavefront/tiny_obj_loader.h - ../FiniteElementMethod/FiniteElementDemo.cpp - ../../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 - ../../btgui/urdf/urdfdom/urdf_parser/src/joint.cpp - ../../btgui/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h - ../../btgui/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h - ../../btgui/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h - ../../btgui/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h - ../../btgui/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h - ../../btgui/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h - ../../btgui/tinyxml/tinystr.cpp - ../../btgui/tinyxml/tinyxml.cpp - ../../btgui/tinyxml/tinyxmlerror.cpp - ../../btgui/tinyxml/tinyxmlparser.cpp - ../../btgui/urdf/boost_replacement/lexical_cast.h - ../../btgui/urdf/boost_replacement/shared_ptr.h - ../../btgui/urdf/boost_replacement/printf_console.cpp - ../../btgui/urdf/boost_replacement/printf_console.h - ../../btgui/urdf/boost_replacement/string_split.cpp - ../../btgui/urdf/boost_replacement/string_split.h + ExampleEntries.cpp + ExampleEntries.h + ../BasicDemo/BasicExample.cpp + ../BasicDemo/BasicExample.h + ../ForkLift/ForkLiftDemo.cpp + ../ForkLift/ForkLiftDemo.h + ../GyroscopicDemo/GyroscopicSetup.cpp + ../GyroscopicDemo/GyroscopicSetup.h + ../Planar2D/Planar2D.cpp + ../Planar2D/Planar2D.h + ../RenderingExamples/CoordinateSystemDemo.cpp + ../RenderingExamples/CoordinateSystemDemo.h + ../RenderingExamples/RaytracerSetup.cpp + ../RenderingExamples/RaytracerSetup.h + ../RenderingExamples/RenderInstancingDemo.cpp + ../RenderingExamples/RenderInstancingDemo.h + ../Benchmarks/BenchmarkDemo.cpp + ../Benchmarks/BenchmarkDemo.h + ../Benchmarks/landscapeData.h + ../Benchmarks/TaruData + ../Importers/ImportBsp/BspConverter.h + ../Importers/ImportBsp/BspLoader.h + ../Importers/ImportBsp/ImportBspExample.h + ../Importers/ImportColladaDemo/btMatrix4x4.h + ../Importers/ImportColladaDemo/ColladaGraphicsInstance.h + ../Importers/ImportColladaDemo/ImportColladaSetup.h + ../Importers/ImportColladaDemo/LoadMeshFromCollada.h + ../Importers/ImportObjDemo/ImportObjExample.h + ../Importers/ImportObjDemo/LoadMeshFromObj.h + ../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.h + ../Importers/ImportSTLDemo/ImportSTLSetup.h + ../Importers/ImportSTLDemo/LoadMeshFromSTL.h + ../Importers/ImportURDFDemo/ConvertRigidBodies2MultiBody.h + ../Importers/ImportURDFDemo/ImportURDFSetup.h + ../Importers/ImportURDFDemo/URDF2Bullet.h + ../Importers/ImportURDFDemo/urdf_samples.h + ../Importers/ImportBsp/BspConverter.cpp + ../Importers/ImportBsp/BspLoader.cpp + ../Importers/ImportBsp/ImportBspExample.cpp + ../Importers/ImportColladaDemo/ImportColladaSetup.cpp + ../Importers/ImportColladaDemo/LoadMeshFromCollada.cpp + ../Importers/ImportObjDemo/ImportObjExample.cpp + ../Importers/ImportObjDemo/LoadMeshFromObj.cpp + ../Importers/ImportObjDemo/Wavefront2GLInstanceGraphicsShape.cpp + ../Importers/ImportSTLDemo/ImportSTLSetup.cpp + ../Importers/ImportURDFDemo/ImportURDFSetup.cpp + ../Importers/ImportURDFDemo/URDF2Bullet.cpp + + ../ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp + ../ThirdPartyLibs/tinyxml/tinystr.cpp + ../ThirdPartyLibs/tinyxml/tinyxml.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp + + + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/pose.cpp + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/model.cpp + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/link.cpp + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/src/joint.cpp + ../ThirdPartyLibs/urdf/urdfdom/urdf_parser/include/urdf_parser/urdf_parser.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_exception/include/urdf_exception/exception.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/pose.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/model.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/link.h + ../ThirdPartyLibs/urdf/urdfdom_headers/urdf_model/include/urdf_model/joint.h + ../ThirdPartyLibs/tinyxml/tinystr.cpp + ../ThirdPartyLibs/tinyxml/tinyxml.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlerror.cpp + ../ThirdPartyLibs/tinyxml/tinyxmlparser.cpp + ../ThirdPartyLibs/urdf/boost_replacement/lexical_cast.h + ../ThirdPartyLibs/urdf/boost_replacement/shared_ptr.h + ../ThirdPartyLibs/urdf/boost_replacement/printf_console.cpp + ../ThirdPartyLibs/urdf/boost_replacement/printf_console.h + ../ThirdPartyLibs/urdf/boost_replacement/string_split.cpp + ../ThirdPartyLibs/urdf/boost_replacement/string_split.h + ../Utils/b3Clock.cpp + ../Utils/b3Clock.h + ${ExampleBrowser_SRCS} + ${ExampleBrowser_HDRS} ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ) LINK_LIBRARIES( - Bullet3AppSupport lua-5.2.3 Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} + Bullet3Common BulletSoftBody BulletDynamics BulletCollision LinearMath OpenGLWindow gwen ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ) IF (WIN32) - SET(App_AllBullet2Demos_SRCS ${App_AllBullet2Demos_SRCS} ${App_AllBullet2Demos_Common_SRCS}) + SET(App_ExampleBrowser_SRCS ${App_ExampleBrowser_SRCS} ) INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) ADD_DEFINITIONS(-DGLEW_STATIC) ELSE(WIN32) @@ -105,12 +110,12 @@ ELSE(WIN32) find_library(COCOA NAMES Cocoa) MESSAGE(${COCOA}) link_libraries(${COCOA}) - ELSE(APPLE) + ELSE(APPLE) ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_STATIC") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") INCLUDE_DIRECTORIES( - ${BULLET_PHYSICS_SOURCE_DIR}/btgui/OpenGLWindow/GlewWindows + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) LINK_LIBRARIES( pthread dl) ENDIF(APPLE) @@ -119,13 +124,13 @@ ENDIF(WIN32) -ADD_EXECUTABLE(App_AllBullet2Demos - ${App_AllBullet2Demos_SRCS} +ADD_EXECUTABLE(App_ExampleBrowser + ${App_ExampleBrowser_SRCS} ) IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) - SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES DEBUG_POSTFIX "_Debug") - SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") - SET_TARGET_PROPERTIES(App_AllBullet2Demos PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") + SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES DEBUG_POSTFIX "_Debug") + SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") + SET_TARGET_PROPERTIES(App_ExampleBrowser PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) diff --git a/examples/ExampleBrowser/ExampleEntries.cpp b/examples/ExampleBrowser/ExampleEntries.cpp index 592f7b2e2..f03ba31b2 100644 --- a/examples/ExampleBrowser/ExampleEntries.cpp +++ b/examples/ExampleBrowser/ExampleEntries.cpp @@ -34,16 +34,16 @@ struct ExampleEntry static ExampleEntry gDefaultExamples[]= { - ExampleEntry(0,"Rendering",0), - ExampleEntry(1,"Instanced Rendering", RenderInstancingCreateFunc), - ExampleEntry(1,"CoordinateSystemDemo",CoordinateSystemCreateFunc), - ExampleEntry(1,"Raytracer",RayTracerCreateFunc), + ExampleEntry(0,"API",0), ExampleEntry(1,"Basic Example",BasicExampleCreateFunc), + ExampleEntry(1,"Gyroscopic", GyroscopicCreateFunc), + ExampleEntry(1,"Planar 2D",Planar2DCreateFunc), +//#ifndef _DEBUG ExampleEntry(0,"Benchmarks", 0), ExampleEntry(1,"3000 boxes", BenchmarkCreateFunc, 1), ExampleEntry(1,"1000 stack", BenchmarkCreateFunc, 2), @@ -51,21 +51,27 @@ static ExampleEntry gDefaultExamples[]= ExampleEntry(1,"Convex stack", BenchmarkCreateFunc, 4), ExampleEntry(1,"Prim vs Mesh", BenchmarkCreateFunc, 5), ExampleEntry(1,"Convex vs Mesh", BenchmarkCreateFunc, 6), - ExampleEntry(1,"7", BenchmarkCreateFunc, 7), + ExampleEntry(1,"Raycast", BenchmarkCreateFunc, 7), +//#endif + ExampleEntry(0,"Importers", 0), ExampleEntry(1,"Wavefront Obj", ImportObjCreateFunc, 0), + ExampleEntry(1,"Quake BSP", ImportBspCreateFunc, 0), ExampleEntry(1,"COLLADA dae", ImportColladaCreateFunc, 0), ExampleEntry(1,"STL", ImportSTLCreateFunc, 0), ExampleEntry(1,"URDF (RigidBody)", ImportURDFCreateFunc, 0), ExampleEntry(1,"URDF (MultiBody)", ImportURDFCreateFunc, 1), - - ExampleEntry(0,"Vehicles",0), + ExampleEntry(1,"ForkLift",ForkLiftCreateFunc), - + + ExampleEntry(0,"Rendering",0), + ExampleEntry(1,"Instanced Rendering", RenderInstancingCreateFunc), + ExampleEntry(1,"CoordinateSystemDemo",CoordinateSystemCreateFunc), + ExampleEntry(1,"Raytracer",RayTracerCreateFunc), }; @@ -92,14 +98,8 @@ void ExampleEntries::initExampleEntries() { m_data->m_allExamples.clear(); - { - ExampleEntry e(0,"Basic Concepts", 0); - m_data->m_allExamples.push_back(e); - } - { - ExampleEntry e(1,"Empty",EmptyExample::CreateFunc); - m_data->m_allExamples.push_back(e); - } + + int numDefaultEntries = sizeof(gDefaultExamples)/sizeof(ExampleEntry); for (int i=0;im_allExamples.push_back(gDefaultExamples[i]); } + if (m_data->m_allExamples.size()==0) + { + + { + ExampleEntry e(0,"Empty", 0); + m_data->m_allExamples.push_back(e); + } + + { + ExampleEntry e(1,"Empty",EmptyExample::CreateFunc); + m_data->m_allExamples.push_back(e); + } + } + } void ExampleEntries::registerExampleEntry(int menuLevel, const char* name,ExampleInterface::CreateFunc* createFunc, int option) diff --git a/examples/HelloWorld/CMakeLists.txt b/examples/HelloWorld/CMakeLists.txt index 3c15ad1d7..66fcab054 100644 --- a/examples/HelloWorld/CMakeLists.txt +++ b/examples/HelloWorld/CMakeLists.txt @@ -9,12 +9,12 @@ LINK_LIBRARIES( ) IF (WIN32) - ADD_EXECUTABLE(AppHelloWorld + ADD_EXECUTABLE(App_HelloWorld HelloWorld.cpp ${BULLET_PHYSICS_SOURCE_DIR}/build3/bullet.rc ) ELSE() - ADD_EXECUTABLE(AppHelloWorld + ADD_EXECUTABLE(App_HelloWorld HelloWorld.cpp ) ENDIF() @@ -23,7 +23,7 @@ ENDIF() IF (INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) - SET_TARGET_PROPERTIES(AppHelloWorld PROPERTIES DEBUG_POSTFIX "_Debug") - SET_TARGET_PROPERTIES(AppHelloWorld PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") - SET_TARGET_PROPERTIES(AppHelloWorld PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") + SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES DEBUG_POSTFIX "_Debug") + SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES MINSIZEREL_POSTFIX "_MinsizeRel") + SET_TARGET_PROPERTIES(App_HelloWorld PROPERTIES RELWITHDEBINFO_POSTFIX "_RelWithDebugInfo") ENDIF(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES) \ No newline at end of file diff --git a/examples/HelloWorld/HelloWorld.cpp b/examples/HelloWorld/HelloWorld.cpp index bea045d0d..582b45795 100644 --- a/examples/HelloWorld/HelloWorld.cpp +++ b/examples/HelloWorld/HelloWorld.cpp @@ -16,6 +16,7 @@ subject to the following restrictions: ///-----includes_start----- #include "btBulletDynamicsCommon.h" #include +#include /// This is a Hello World program for running a basic Bullet physics simulation @@ -122,12 +123,16 @@ int main(int argc, char** argv) { btCollisionObject* obj = dynamicsWorld->getCollisionObjectArray()[j]; btRigidBody* body = btRigidBody::upcast(obj); + btTransform trans; if (body && body->getMotionState()) { - btTransform trans; body->getMotionState()->getWorldTransform(trans); - printf("world pos = %f,%f,%f\n",float(trans.getOrigin().getX()),float(trans.getOrigin().getY()),float(trans.getOrigin().getZ())); + + } else + { + trans = obj->getWorldTransform(); } + printf("world pos object %d = %f,%f,%f\n",j,float(trans.getOrigin().getX()),float(trans.getOrigin().getY()),float(trans.getOrigin().getZ())); } } @@ -176,5 +181,7 @@ int main(int argc, char** argv) collisionShapes.clear(); ///-----cleanup_end----- + printf("Press a key to exit\n"); + getch(); } diff --git a/examples/OpenGLWindow/CMakeLists.txt b/examples/OpenGLWindow/CMakeLists.txt index f552958bb..451ea3dcd 100644 --- a/examples/OpenGLWindow/CMakeLists.txt +++ b/examples/OpenGLWindow/CMakeLists.txt @@ -19,9 +19,9 @@ LIST(REMOVE_ITEM OpenGLWindowCommon_CPP X11OpenGLWindow.cpp ) #MESSAGE (${OpenGLWindowCommon_CPP}) IF (WIN32) - SET(OpenGLWindow_SRCS GlewWindows/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP}) + SET(OpenGLWindow_SRCS ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowWin32_CPP} ${OpenGLWindowCommon_CPP}) INCLUDE_DIRECTORIES( - GlewWindows + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) ADD_DEFINITIONS(-DGLEW_STATIC) ENDIF(WIN32) @@ -33,13 +33,13 @@ ENDIF(APPLE) #no Linux detection? IF(NOT WIN32 AND NOT APPLE) INCLUDE_DIRECTORIES( - GlewWindows + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) ADD_DEFINITIONS(-DGLEW_STATIC) ADD_DEFINITIONS("-DGLEW_INIT_OPENGL11_FUNCTIONS=1") ADD_DEFINITIONS("-DGLEW_DYNAMIC_LOAD_ALL_GLX_FUNCTIONS=1") - SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} GlewWindows/glew.c ${OpenGLWindowCommon_CPP} ) + SET(OpenGLWindow_SRCS ${OpenGLWindowLinux_CPP} ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew/glew.c ${OpenGLWindowCommon_CPP} ) ENDIF() diff --git a/examples/OpenGLWindow/Win32Window.cpp b/examples/OpenGLWindow/Win32Window.cpp index eef329334..5f3e9a2b3 100644 --- a/examples/OpenGLWindow/Win32Window.cpp +++ b/examples/OpenGLWindow/Win32Window.cpp @@ -113,7 +113,7 @@ int getAsciiCodeFromVirtualKeycode(int virtualKeyCode) return keycode; } -bool Win32Window::isModifiedKeyPressed(int key) +bool Win32Window::isModifierKeyPressed(int key) { bool isPressed = false; diff --git a/examples/OpenGLWindow/Win32Window.h b/examples/OpenGLWindow/Win32Window.h index e2dccdfcc..70681b3cd 100644 --- a/examples/OpenGLWindow/Win32Window.h +++ b/examples/OpenGLWindow/Win32Window.h @@ -23,7 +23,7 @@ struct InternalData2; #include "../CommonInterfaces/CommonWindowInterface.h" -class Win32Window : public b3gWindowInterface +class Win32Window : public CommonWindowInterface { protected: @@ -80,7 +80,7 @@ public: virtual void setWindowTitle(const char* title); - virtual bool isModifiedKeyPressed(int key); + virtual bool isModifierKeyPressed(int key); }; #endif //_WIN32_WINDOW_H \ No newline at end of file diff --git a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt index 6ab8afd74..2fad3951c 100644 --- a/examples/ThirdPartyLibs/Gwen/CMakeLists.txt +++ b/examples/ThirdPartyLibs/Gwen/CMakeLists.txt @@ -1,10 +1,11 @@ INCLUDE_DIRECTORIES( ${BULLET_PHYSICS_SOURCE_DIR}/src - ${BULLET_PHYSICS_SOURCE_DIR}/btgui + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs + ${BULLET_PHYSICS_SOURCE_DIR}/examples/ThirdPartyLibs/Glew ) -ADD_DEFINITIONS( -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB ) +ADD_DEFINITIONS( -DGLEW_STATIC -DGWEN_COMPILE_STATIC -D_HAS_EXCEPTIONS=0 -D_STATIC_CPPLIB ) FILE(GLOB gwen_SRCS "*.cpp" "Controls/*.cpp" "Controls/Dialog/*.cpp" "Controls/Dialogs/*.cpp" "Controls/Layout/*.cpp" "Controls/Property/*.cpp" "Input/*.cpp" "Platforms/*.cpp" "Renderers/*.cpp" "Skins/*.cpp") FILE(GLOB gwen_HDRS "*.h" "Controls/*.h" "Controls/Dialog/*.h" "Controls/Dialogs/*.h" "Controls/Layout/*.h" "Controls/Property/*.h" "Input/*.h" "Platforms/*.h" "Renderers/*.h" "Skins/*.h")