From c1147031569838e2f555d849e161f425fd7f6a8e Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Mon, 11 Sep 2006 06:10:40 +0000 Subject: [PATCH] updated demos includes --- Demos/OpenGL/CMakeLists.txt | 2 +- Demos/OpenGL/DemoApplication.cpp | 5 ++--- Demos/OpenGL/Jamfile | 12 +++++++++++- VERSION | 2 +- changes.txt | 2 ++ 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Demos/OpenGL/CMakeLists.txt b/Demos/OpenGL/CMakeLists.txt index c35e5794a..fb39bbae1 100644 --- a/Demos/OpenGL/CMakeLists.txt +++ b/Demos/OpenGL/CMakeLists.txt @@ -47,7 +47,7 @@ ELSE (WIN32) ENDIF (WIN32) INCLUDE_DIRECTORIES( -${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } +${BULLET_PHYSICS_SOURCE_DIR}/BulletDynamics ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/Common ${BULLET_PHYSICS_SOURCE_DIR}/Extras/PhysicsInterface/CcdPhysics ${BULLET_PHYSICS_SOURCE_DIR}/LinearMath ${BULLET_PHYSICS_SOURCE_DIR}/Bullet } ) ADD_LIBRARY(LibOpenGLSupport diff --git a/Demos/OpenGL/DemoApplication.cpp b/Demos/OpenGL/DemoApplication.cpp index 71ea9dec1..cb9ec12c0 100644 --- a/Demos/OpenGL/DemoApplication.cpp +++ b/Demos/OpenGL/DemoApplication.cpp @@ -38,9 +38,8 @@ DemoApplication::DemoApplication() //see IDebugDraw.h for modes : m_physicsEnvironmentPtr(0), -m_debugMode(0), m_cameraDistance(15.0), - + m_debugMode(0), m_ele(0.f), m_azi(0.f), m_cameraPosition(0.f,0.f,0.f), @@ -891,4 +890,4 @@ void DemoApplication::renderme() } -} \ No newline at end of file +} diff --git a/Demos/OpenGL/Jamfile b/Demos/OpenGL/Jamfile index 36ab413ce..83ff90a17 100644 --- a/Demos/OpenGL/Jamfile +++ b/Demos/OpenGL/Jamfile @@ -2,7 +2,17 @@ SubDir TOP Demos OpenGL ; if $(GLUT.AVAILABLE) = "yes" { + +IncludeDir Extras/PhysicsInterface/Common ; +IncludeDir Extras/PhysicsInterface/CcdPhysics ; + Description bulletopenglsupport : "Bullet OpenGL support" ; - Library bulletopenglsupport : [ Wildcard *.h *.cpp ] : noinstall ; + Library bulletopenglsupport : + [ Wildcard *.h *.cpp ] : noinstall +; +CFlags bulletopenglsupport : +[ FIncludes $(TOP)/Extras/PhysicsInterface/Common ] +[ FIncludes $(TOP)/Extras/PhysicsInterface/CcdPhysics ] +; ExternalLibs bulletopenglsupport : GLUT ; } diff --git a/VERSION b/VERSION index f67ed4d9e..94b5e5eb6 100644 --- a/VERSION +++ b/VERSION @@ -1,3 +1,3 @@ -Bullet Collision Detection and Physics Library version 1.9 +Bullet Collision Detection and Physics Library version 2.0 http://bullet.sourceforge.net diff --git a/changes.txt b/changes.txt index 0810801ff..9ac8cd026 100644 --- a/changes.txt +++ b/changes.txt @@ -1,5 +1,7 @@ Bullet Continuous Collision Detection and Physics Library Erwin Coumans +2006 Sept 10 + Started cleaning up demos 2006 Sept 4 Fixed concave collision bug (caused instability/missing collisions in meshes/compounds)