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

Add new demos to cmake: SerializeDemo and InternalEdgeDemo

Browse Source 
Fix in btShapeHull for previous commit
Add support to serialize name for objects
Updated serialization structures.
This commit is contained in:
erwin.coumans
2010-02-04 01:07:07 +00:00
parent 43d82fc20c
commit 58c5630d7f
13 changed files with 481 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
View File

@@ -1090,7 +1090,7 @@ void btDiscreteDynamicsWorld::serializeRigidBodies(btSerializer* serializer)
{
int len = colObj->calculateSerializeBufferSize();
btChunk* chunk = serializer->allocate(len,1);
const char* structType = colObj->serialize(chunk->m_oldPtr);
const char* structType = colObj->serialize(chunk->m_oldPtr, serializer);
serializer->finalizeChunk(chunk,structType,BT_RIGIDBODY_CODE,colObj);
}
}

4
src/BulletDynamics/Dynamics/btRigidBody.cpp
View File

@@ -325,11 +325,11 @@ int btRigidBody::calculateSerializeBufferSize() const
}
///fills the dataBuffer and returns the struct name (and 0 on failure)
const char* btRigidBody::serialize(void* dataBuffer) const
const char* btRigidBody::serialize(void* dataBuffer, class btSerializer* serializer) const
{
btRigidBodyData* rbd = (btRigidBodyData*) dataBuffer;
btCollisionObject::serialize(&rbd->m_collisionObjectData);
btCollisionObject::serialize(&rbd->m_collisionObjectData, serializer);
m_invInertiaTensorWorld.serialize(rbd->m_invInertiaTensorWorld);
m_linearVelocity.serialize(rbd->m_linearVelocity);

2
src/BulletDynamics/Dynamics/btRigidBody.h
View File

@@ -524,7 +524,7 @@ public:
virtual int calculateSerializeBufferSize() const;
///fills the dataBuffer and returns the struct name (and 0 on failure)
virtual const char* serialize(void* dataBuffer) const;
virtual const char* serialize(void* dataBuffer, class btSerializer* serializer) const;
};