diff options
| author | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2008-08-01 01:04:45 +0000 |
|---|---|---|
| committer | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2008-08-01 01:04:45 +0000 |
| commit | 4894f24c9a2b3982e0216087ae15aa3d335b18be (patch) | |
| tree | a0070c08ec41920460a80b393b231c8abd708caf /Demos/ContinuousConvexCollision | |
| parent | af4520801b723e57abeaa77ef6a6fff30922d2bd (diff) | |
| download | bullet3-4894f24c9a2b3982e0216087ae15aa3d335b18be.tar.gz | |
Fixes for FPU exceptions, thanks to Phil Knight for reporting and John McCutchan for fix/workarounds.
Added new cluster collision methods for soft bodies, thanks to Nathanael Presson.
Enable/disable textures/shadows for specific demos.
Diffstat (limited to 'Demos/ContinuousConvexCollision')
| -rw-r--r-- | Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp index b2d8cf331..a9e63e822 100644 --- a/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp +++ b/Demos/ContinuousConvexCollision/ContinuousConvexCollisionDemo.cpp @@ -149,6 +149,10 @@ void btContinuousConvexCollisionDemo::displayCallback(void) { btScalar m[16]; int i; + btVector3 worldBoundsMin(-1000,-1000,-1000); + btVector3 worldBoundsMax(1000,1000,1000); + + /*for (i=0;i<numObjects;i++) { fromTrans[i].getOpenGLMatrix( m ); @@ -177,7 +181,7 @@ void btContinuousConvexCollisionDemo::displayCallback(void) { //m_shapeDrawer.drawOpenGL(m,shapePtr[i]); interpolatedTrans.getOpenGLMatrix( m ); - m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(1,0,1),getDebugMode()); + m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(1,0,1),getDebugMode(),worldBoundsMin,worldBoundsMax); } } } @@ -229,7 +233,7 @@ void btContinuousConvexCollisionDemo::displayCallback(void) { for (i=0;i<numObjects;i++) { fromTrans[i].getOpenGLMatrix(m); - m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(1,1,1),getDebugMode()); + m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(1,1,1),getDebugMode(),worldBoundsMin,worldBoundsMax); } btDebugCastResult rayResult1(fromTrans[0],shapePtr[0],linVels[0],angVels[0],&m_shapeDrawer); @@ -267,12 +271,12 @@ void btContinuousConvexCollisionDemo::displayCallback(void) { btTransformUtil::integrateTransform(fromTrans[0],linVels[0],angVels[0],rayResultPtr->m_fraction,hitTrans); hitTrans.getOpenGLMatrix(m); - m_shapeDrawer.drawOpenGL(m,shapePtr[0],btVector3(0,1,0),getDebugMode()); + m_shapeDrawer.drawOpenGL(m,shapePtr[0],btVector3(0,1,0),getDebugMode(),worldBoundsMin,worldBoundsMax); btTransformUtil::integrateTransform(fromTrans[i],linVels[i],angVels[i],rayResultPtr->m_fraction,hitTrans); hitTrans.getOpenGLMatrix(m); - m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(0,1,1),getDebugMode()); + m_shapeDrawer.drawOpenGL(m,shapePtr[i],btVector3(0,1,1),getDebugMode(),worldBoundsMin,worldBoundsMax); } |