Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added option to install 'Extra' libs, turned off by default (BulletMultiThreaded, OpenGL, COLLADA_DOM, libxml,BulletColladaConverter)

Browse Source 
Thanks xenonofarcticus, for the patch: http://code.google.com/p/bullet/issues/detail?id=294
This commit is contained in:
erwin.coumans
2009-12-13 20:30:29 +00:00
parent 0a6f7b271d
commit 6536d8cc31
9 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/BasicDemo/BasicDemo.cpp
View File

@@ -174,7 +174,7 @@ void BasicDemo::initPhysics()
btDefaultMotionState* myMotionState = new btDefaultMotionState(startTransform);
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
body->setActivationState(ISLAND_SLEEPING);
m_dynamicsWorld->addRigidBody(body);

12
Demos/OpenGL/CMakeLists.txt
View File

@@ -33,3 +33,15 @@ ADD_LIBRARY(OpenGLSupport
IF (BUILD_SHARED_LIBS)
TARGET_LINK_LIBRARIES(OpenGLSupport BulletDynamics BulletCollision ${GLUT_glut_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
ENDIF (BUILD_SHARED_LIBS)
#INSTALL of other files requires CMake 2.6
IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)
IF(INSTALL_EXTRA_LIBS)
IF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS OpenGLSupport DESTINATION .)
ELSE (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
INSTALL(TARGETS OpenGLSupport DESTINATION lib)
INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.h")
ENDIF (APPLE AND BUILD_SHARED_LIBS AND FRAMEWORK)
ENDIF (INSTALL_EXTRA_LIBS)
ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.5)

3
Demos/OpenGL/GL_DialogDynamicsWorld.cpp
View File

@@ -200,7 +200,6 @@ GL_DialogWindow* GL_DialogDynamicsWorld::createDialog(int horPos,int vertPos,int
body->setWorldTransform(trans);
body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1));
@@ -229,7 +228,6 @@ GL_SliderControl* GL_DialogDynamicsWorld::createSlider(GL_DialogWindow* dialog,
body->setWorldTransform(trans);
//body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1));
@@ -292,7 +290,6 @@ GL_ToggleControl* GL_DialogDynamicsWorld::createToggle(GL_DialogWindow* dialog,
body->setWorldTransform(trans);
body->setDamping(0.999,0.99);
//body->setContactProcessingThreshold(colShape->getContactBreakingThreshold());
//body->setActivationState(ISLAND_SLEEPING);
body->setLinearFactor(btVector3(1,1,0));
//body->setAngularFactor(btVector3(0,0,1));