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

more Bullet serialization (uncompleted triangle mesh saving, work-in-progress)

Browse Source
This commit is contained in:
erwin.coumans
2010-01-23 02:13:25 +00:00
parent 5378cf4c8a
commit 5e85d43b0b
5 changed files with 240 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
View File

@@ -80,7 +80,33 @@ public:
{ {
return m_useQuantizedAabbCompression; return m_useQuantizedAabbCompression;
} }
//virtual int calculateSerializeBufferSize();
///fills the dataBuffer and returns the struct name (and 0 on failure)
//virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
};
#if 0
struct btBvhTriangleMeshShapeData
{
btTriangleMeshShapeData m_trimeshData;
//btOptimizedBvhData m_bvh;
char m_useQuantizedAabbCompression;
char m_ownsBvh;
};
SIMD_FORCE_INLINE int btBvhTriangleMeshShape::calculateSerializeBufferSize()
{
return sizeof(btBvhTriangleMeshShapeData);
} }
;
#endif
#endif //BVH_TRIANGLE_MESH_SHAPE_H #endif //BVH_TRIANGLE_MESH_SHAPE_H

139
src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
View File

@@ -14,6 +14,7 @@ subject to the following restrictions:
*/ */
#include "btStridingMeshInterface.h" #include "btStridingMeshInterface.h"
#include "LinearMath/btSerializer.h"
btStridingMeshInterface::~btStridingMeshInterface() btStridingMeshInterface::~btStridingMeshInterface()
{ {
@@ -179,3 +180,141 @@ void btStridingMeshInterface::calculateAabbBruteForce(btVector3& aabbMin,btVecto
aabbMin = aabbCallback.m_aabbMin; aabbMin = aabbCallback.m_aabbMin;
aabbMax = aabbCallback.m_aabbMax; aabbMax = aabbCallback.m_aabbMax;
} }
///fills the dataBuffer and returns the struct name (and 0 on failure)
const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* serializer) const
{
btStridingMeshInterfaceData* trimeshData = (btStridingMeshInterfaceData*) dataBuffer;
trimeshData->m_numMeshParts = getNumSubParts();
void* uniquePtr = 0;
trimeshData->m_meshPartsPtr = trimeshData->m_numMeshParts ? (btMeshPartData*) uniquePtr : 0;
if (trimeshData->m_numMeshParts)
{
btChunk* chunk = serializer->allocate(sizeof(btMeshPartData),trimeshData->m_numMeshParts);
btMeshPartData* memPtr = (btMeshPartData*)chunk->m_oldPtr;
int numtotalphysicsverts = 0;
int part,graphicssubparts = getNumSubParts();
const unsigned char * vertexbase;
const unsigned char * indexbase;
int indexstride;
PHY_ScalarType type;
PHY_ScalarType gfxindextype;
int stride,numverts,numtriangles;
int gfxindex;
btVector3 triangle[3];
btVector3 meshScaling = getScaling();
///if the number of parts is big, the performance might drop due to the innerloop switch on indextype
for (part=0;part<graphicssubparts ;part++)
{
getLockedReadOnlyVertexIndexBase(&vertexbase,numverts,type,stride,&indexbase,indexstride,numtriangles,gfxindextype,part);
memPtr->m_numTriangles = numtriangles;//indices = 3*numtriangles
memPtr->m_numVertices = numverts;
switch (type)
{
case PHY_FLOAT:
{
float* graphicsbase;
switch (gfxindextype)
{
case PHY_INTEGER:
{
for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
{
unsigned int* tri_indices= (unsigned int*)(indexbase+gfxindex*indexstride);
graphicsbase = (float*)(vertexbase+tri_indices[0]*stride);
triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
graphicsbase = (float*)(vertexbase+tri_indices[1]*stride);
triangle[1].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(), graphicsbase[2]*meshScaling.getZ());
graphicsbase = (float*)(vertexbase+tri_indices[2]*stride);
triangle[2].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(), graphicsbase[2]*meshScaling.getZ());
}
break;
}
case PHY_SHORT:
{
for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
{
unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
graphicsbase = (float*)(vertexbase+tri_indices[0]*stride);
triangle[0].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(),graphicsbase[2]*meshScaling.getZ());
graphicsbase = (float*)(vertexbase+tri_indices[1]*stride);
triangle[1].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(), graphicsbase[2]*meshScaling.getZ());
graphicsbase = (float*)(vertexbase+tri_indices[2]*stride);
triangle[2].setValue(graphicsbase[0]*meshScaling.getX(),graphicsbase[1]*meshScaling.getY(), graphicsbase[2]*meshScaling.getZ());
}
break;
}
default:
btAssert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
}
break;
}
case PHY_DOUBLE:
{
double* graphicsbase;
switch (gfxindextype)
{
case PHY_INTEGER:
{
for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
{
unsigned int* tri_indices= (unsigned int*)(indexbase+gfxindex*indexstride);
graphicsbase = (double*)(vertexbase+tri_indices[0]*stride);
triangle[0].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),(btScalar)graphicsbase[2]*meshScaling.getZ());
graphicsbase = (double*)(vertexbase+tri_indices[1]*stride);
triangle[1].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(), (btScalar)graphicsbase[2]*meshScaling.getZ());
graphicsbase = (double*)(vertexbase+tri_indices[2]*stride);
triangle[2].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(), (btScalar)graphicsbase[2]*meshScaling.getZ());
}
break;
}
case PHY_SHORT:
{
for (gfxindex=0;gfxindex<numtriangles;gfxindex++)
{
unsigned short int* tri_indices= (unsigned short int*)(indexbase+gfxindex*indexstride);
graphicsbase = (double*)(vertexbase+tri_indices[0]*stride);
triangle[0].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(),(btScalar)graphicsbase[2]*meshScaling.getZ());
graphicsbase = (double*)(vertexbase+tri_indices[1]*stride);
triangle[1].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(), (btScalar)graphicsbase[2]*meshScaling.getZ());
graphicsbase = (double*)(vertexbase+tri_indices[2]*stride);
triangle[2].setValue((btScalar)graphicsbase[0]*meshScaling.getX(),(btScalar)graphicsbase[1]*meshScaling.getY(), (btScalar)graphicsbase[2]*meshScaling.getZ());
}
break;
}
default:
btAssert((gfxindextype == PHY_INTEGER) || (gfxindextype == PHY_SHORT));
}
break;
}
default:
btAssert((type == PHY_FLOAT) || (type == PHY_DOUBLE));
}
unLockReadOnlyVertexBase(part);
}
serializer->finalizeChunk(chunk,"btMeshPartData",BT_ARRAY_CODE,uniquePtr);
}
m_scaling.serialize(trimeshData->m_scaling);
return "btStridingMeshInterfaceData";
}

37
src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
View File

@@ -89,8 +89,43 @@ class btStridingMeshInterface
m_scaling = scaling; m_scaling = scaling;
} }
virtual int calculateSerializeBufferSize();
///fills the dataBuffer and returns the struct name (and 0 on failure)
virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
}; };
struct btIntIndexData
{
int m_value;
};
struct btMeshPartData
{
btVector3Data *m_vertices;
btIntIndexData *m_indices;
int m_numTriangles;
int m_numVertices;
};
struct btStridingMeshInterfaceData
{
btMeshPartData *m_meshPartsPtr;
int m_numMeshParts;
btVector3Data m_scaling;
};
SIMD_FORCE_INLINE int btStridingMeshInterface::calculateSerializeBufferSize()
{
return sizeof(btStridingMeshInterfaceData);
}
#endif //STRIDING_MESHINTERFACE_H #endif //STRIDING_MESHINTERFACE_H

15
src/BulletCollision/CollisionShapes/btTriangleMeshShape.cpp
View File

@@ -207,3 +207,18 @@ btVector3 btTriangleMeshShape::localGetSupportingVertex(const btVector3& vec) co
return supportVertex; return supportVertex;
} }
///fills the dataBuffer and returns the struct name (and 0 on failure)
const char* btTriangleMeshShape::serialize(void* dataBuffer, btSerializer* serializer) const
{
btTriangleMeshShapeData* trimeshData = (btTriangleMeshShapeData*) dataBuffer;
btCollisionShape::serialize(&trimeshData->m_collisionShapeData,serializer);
m_meshInterface->serialize(&trimeshData->m_meshInterface, serializer);
trimeshData->m_collisionMargin = m_collisionMargin;
return "btTriangleMeshShapeData";
}

23
src/BulletCollision/CollisionShapes/btTriangleMeshShape.h
View File

@@ -79,7 +79,30 @@ public:
//debugging //debugging
virtual const char* getName()const {return "TRIANGLEMESH";} virtual const char* getName()const {return "TRIANGLEMESH";}
virtual int calculateSerializeBufferSize();
///fills the dataBuffer and returns the struct name (and 0 on failure)
virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
}; };
struct btTriangleMeshShapeData
{
//btConcaveShapeData m_concaveShapeData;
btCollisionShapeData m_collisionShapeData;
btStridingMeshInterfaceData m_meshInterface;
btScalar m_collisionMargin;
};
SIMD_FORCE_INLINE int btTriangleMeshShape::calculateSerializeBufferSize()
{
return sizeof(btTriangleMeshShapeData);
}
#endif //TRIANGLE_MESH_SHAPE_H #endif //TRIANGLE_MESH_SHAPE_H