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

register the gimpact collision algoritm in the SerializeDemo by default

Browse Source
This commit is contained in:
erwin.coumans
2012-09-11 22:28:41 +00:00
parent 2871a3d30f
commit 9a460942a9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/SerializeDemo/SerializeDemo.cpp
View File

@@ -165,6 +165,7 @@ void SerializeDemo::clientMoveAndDisplay()
{ {
m_dynamicsWorld->stepSimulation(ms / 1000000.f); m_dynamicsWorld->stepSimulation(ms / 1000000.f);
#ifdef DESERIALIZE_SOFT_BODIES #ifdef DESERIALIZE_SOFT_BODIES
if (fSoftBodySolver) if (fSoftBodySolver)
fSoftBodySolver->copyBackToSoftBodies(); fSoftBodySolver->copyBackToSoftBodies();
@@ -289,6 +290,7 @@ void SerializeDemo::setupEmptyDynamicsWorld()
///use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded) ///use the default collision dispatcher. For parallel processing you can use a diffent dispatcher (see Extras/BulletMultiThreaded)
m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration); m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration);
btGImpactCollisionAlgorithm::registerAlgorithm(m_dispatcher);
m_broadphase = new btDbvtBroadphase(); m_broadphase = new btDbvtBroadphase();
@@ -351,6 +353,7 @@ void SerializeDemo::setupEmptyDynamicsWorld()
m_collisionConfiguration, fSoftBodySolver); m_collisionConfiguration, fSoftBodySolver);
m_dynamicsWorld = world; m_dynamicsWorld = world;
//world->setDrawFlags(world->getDrawFlags()^fDrawFlags::Clusters); //world->setDrawFlags(world->getDrawFlags()^fDrawFlags::Clusters);
#else #else
m_dynamicsWorld = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration); m_dynamicsWorld = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration);
@@ -753,6 +756,8 @@ void SerializeDemo::initPhysics()
#endif //DESERIALIZE_SOFT_BODIES #endif //DESERIALIZE_SOFT_BODIES
// fileLoader->setVerboseMode(true); // fileLoader->setVerboseMode(true);
if (!m_fileLoader->loadFile("testFile.bullet")) if (!m_fileLoader->loadFile("testFile.bullet"))
// if (!m_fileLoader->loadFile("../SoftDemo/testFile.bullet")) // if (!m_fileLoader->loadFile("../SoftDemo/testFile.bullet"))
{ {