updated demos includes

This commit is contained in:
ejcoumans
2006-09-11 06:10:40 +00:00
parent 1a6333e709
commit c114703156
5 changed files with 17 additions and 6 deletions

View File

@@ -47,7 +47,7 @@ ELSE (WIN32)
ENDIF (WIN32) ENDIF (WIN32)
INCLUDE_DIRECTORIES( 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 ADD_LIBRARY(LibOpenGLSupport

View File

@@ -38,9 +38,8 @@ DemoApplication::DemoApplication()
//see IDebugDraw.h for modes //see IDebugDraw.h for modes
: :
m_physicsEnvironmentPtr(0), m_physicsEnvironmentPtr(0),
m_debugMode(0),
m_cameraDistance(15.0), m_cameraDistance(15.0),
m_debugMode(0),
m_ele(0.f), m_ele(0.f),
m_azi(0.f), m_azi(0.f),
m_cameraPosition(0.f,0.f,0.f), m_cameraPosition(0.f,0.f,0.f),

View File

@@ -2,7 +2,17 @@ SubDir TOP Demos OpenGL ;
if $(GLUT.AVAILABLE) = "yes" if $(GLUT.AVAILABLE) = "yes"
{ {
IncludeDir Extras/PhysicsInterface/Common ;
IncludeDir Extras/PhysicsInterface/CcdPhysics ;
Description bulletopenglsupport : "Bullet OpenGL support" ; 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 ; ExternalLibs bulletopenglsupport : GLUT ;
} }

View File

@@ -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 http://bullet.sourceforge.net

View File

@@ -1,5 +1,7 @@
Bullet Continuous Collision Detection and Physics Library Bullet Continuous Collision Detection and Physics Library
Erwin Coumans Erwin Coumans
2006 Sept 10
Started cleaning up demos
2006 Sept 4 2006 Sept 4
Fixed concave collision bug (caused instability/missing collisions in meshes/compounds) Fixed concave collision bug (caused instability/missing collisions in meshes/compounds)