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

minor fix in SerializeDemo

Browse Source
This commit is contained in:
erwin.coumans
2012-03-03 03:44:10 +00:00
parent 2be785680c
commit 9c6a790e4b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/SerializeDemo/SerializeDemo.cpp
View File

@@ -813,10 +813,8 @@ void SerializeDemo::initPhysics()
btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia); btRigidBody::btRigidBodyConstructionInfo rbInfo(mass,myMotionState,colShape,localInertia);
btRigidBody* body = new btRigidBody(rbInfo); btRigidBody* body = new btRigidBody(rbInfo);
body->setActivationState(ISLAND_SLEEPING); m_dynamicsWorld->addRigidBody(body);
//body->setActivationState(ISLAND_SLEEPING);
m_dynamicsWorld->addRigidBody(body,1,2);
body->setActivationState(ISLAND_SLEEPING);
} }
} }
} }
@@ -844,10 +842,12 @@ void SerializeDemo::initPhysics()
serializer->registerNameForPointer(p2p,name); serializer->registerNameForPointer(p2p,name);
m_dynamicsWorld->serialize(serializer); m_dynamicsWorld->serialize(serializer);
#if 1
FILE* f2 = fopen("testFile.bullet","wb"); FILE* f2 = fopen("testFile.bullet","wb");
fwrite(serializer->getBufferPointer(),serializer->getCurrentBufferSize(),1,f2); fwrite(serializer->getBufferPointer(),serializer->getCurrentBufferSize(),1,f2);
fclose(f2); fclose(f2);
#endif
} }
//clientResetScene(); //clientResetScene();

2
Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
View File

@@ -1168,7 +1168,7 @@ bool btBulletWorldImporter::convertAllObjects( bParse::btBulletFile* bulletFile
if (bulletFile2->getVersion()>=280) if (bulletFile2->getVersion()>=280)
{ {
constraint->setBreakingImpulseThreshold(constraintData->m_breakingImpulseThreshold); constraint->setBreakingImpulseThreshold(constraintData->m_breakingImpulseThreshold);
constraint->setEnabled(constraintData->m_isEnabled); constraint->setEnabled(constraintData->m_isEnabled!=0);
constraint->setOverrideNumSolverIterations(constraintData->m_overrideNumSolverIterations); constraint->setOverrideNumSolverIterations(constraintData->m_overrideNumSolverIterations);
} }