diff --git a/Demos/SerializeDemo/SerializeDemo.cpp b/Demos/SerializeDemo/SerializeDemo.cpp index a82c8cdf7..7d131c676 100644 --- a/Demos/SerializeDemo/SerializeDemo.cpp +++ b/Demos/SerializeDemo/SerializeDemo.cpp @@ -813,10 +813,8 @@ void SerializeDemo::initPhysics() btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia); btRigidBody* body = new btRigidBody(rbInfo); - body->setActivationState(ISLAND_SLEEPING); - - m_dynamicsWorld->addRigidBody(body,1,2); - body->setActivationState(ISLAND_SLEEPING); + m_dynamicsWorld->addRigidBody(body); + //body->setActivationState(ISLAND_SLEEPING); } } } @@ -844,10 +842,12 @@ void SerializeDemo::initPhysics() serializer->registerNameForPointer(p2p,name); m_dynamicsWorld->serialize(serializer); - +#if 1 FILE* f2 = fopen("testFile.bullet","wb"); fwrite(serializer->getBufferPointer(),serializer->getCurrentBufferSize(),1,f2); fclose(f2); +#endif + } //clientResetScene(); diff --git a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp index 74f38103e..96b8b2ee6 100644 --- a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp +++ b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp @@ -1168,7 +1168,7 @@ bool btBulletWorldImporter::convertAllObjects( bParse::btBulletFile* bulletFile if (bulletFile2->getVersion()>=280) { constraint->setBreakingImpulseThreshold(constraintData->m_breakingImpulseThreshold); - constraint->setEnabled(constraintData->m_isEnabled); + constraint->setEnabled(constraintData->m_isEnabled!=0); constraint->setOverrideNumSolverIterations(constraintData->m_overrideNumSolverIterations); }