diff --git a/Demos/SerializeDemo/SerializeDemo.cpp b/Demos/SerializeDemo/SerializeDemo.cpp index 2a128214b..579a2b03e 100644 --- a/Demos/SerializeDemo/SerializeDemo.cpp +++ b/Demos/SerializeDemo/SerializeDemo.cpp @@ -165,6 +165,7 @@ void SerializeDemo::clientMoveAndDisplay() { m_dynamicsWorld->stepSimulation(ms / 1000000.f); + #ifdef DESERIALIZE_SOFT_BODIES if (fSoftBodySolver) 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) m_dispatcher = new btCollisionDispatcher(m_collisionConfiguration); + btGImpactCollisionAlgorithm::registerAlgorithm(m_dispatcher); m_broadphase = new btDbvtBroadphase(); @@ -351,6 +353,7 @@ void SerializeDemo::setupEmptyDynamicsWorld() m_collisionConfiguration, fSoftBodySolver); m_dynamicsWorld = world; + //world->setDrawFlags(world->getDrawFlags()^fDrawFlags::Clusters); #else m_dynamicsWorld = new btDiscreteDynamicsWorld(m_dispatcher,m_broadphase,m_solver,m_collisionConfiguration); @@ -753,6 +756,8 @@ void SerializeDemo::initPhysics() #endif //DESERIALIZE_SOFT_BODIES // fileLoader->setVerboseMode(true); + + if (!m_fileLoader->loadFile("testFile.bullet")) // if (!m_fileLoader->loadFile("../SoftDemo/testFile.bullet")) {