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

more fixes in serialization/BVH/endianness

Browse Source
This commit is contained in:
ejcoumans
2007-09-19 23:04:37 +00:00
parent 287f11de01
commit a0e92efebb
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -201,7 +201,7 @@ void ConcaveDemo::initPhysics()
void* buffer = 0; void* buffer = 0;
int numBytes = trimeshShape->getOptimizedBvh()->calculateSerializeBufferSize(); int numBytes = trimeshShape->getOptimizedBvh()->calculateSerializeBufferSize();
buffer = btAlignedAlloc(numBytes,16); buffer = btAlignedAlloc(numBytes,16);
bool swapEndian = true; bool swapEndian = false;
trimeshShape->getOptimizedBvh()->serialize(buffer,numBytes,swapEndian); trimeshShape->getOptimizedBvh()->serialize(buffer,numBytes,swapEndian);
FILE* file = fopen("bvh.bin","wb"); FILE* file = fopen("bvh.bin","wb");
fwrite(buffer,1,numBytes,file); fwrite(buffer,1,numBytes,file);
@@ -225,12 +225,14 @@ void ConcaveDemo::initPhysics()
fseek(file, 0, SEEK_SET); fseek(file, 0, SEEK_SET);
void* buffer = btAlignedAlloc(size,16); int buffersize = size+btOptimizedBvh::getAlignmentSerializationPadding();
void* buffer = btAlignedAlloc(buffersize,16);
//memset(buffer,0xcc,size); //memset(buffer,0xcc,size);
int read = fread(buffer,1,size,file); int read = fread(buffer,1,size,file);
fclose(file); fclose(file);
bool swapEndian = true; bool swapEndian = false;
bvh = btOptimizedBvh::deSerializeInPlace(buffer,size,swapEndian); bvh = btOptimizedBvh::deSerializeInPlace(buffer,buffersize,swapEndian);
} }
trimeshShape->setOptimizedBvh(bvh); trimeshShape->setOptimizedBvh(bvh);

6
src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
View File

@@ -898,10 +898,14 @@ static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
unsigned int btOptimizedBvh::getAlignmentSerializationPadding()
{
return BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
}
unsigned btOptimizedBvh::calculateSerializeBufferSize() unsigned btOptimizedBvh::calculateSerializeBufferSize()
{ {
unsigned baseSize = sizeof(btOptimizedBvh) + BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT; unsigned baseSize = sizeof(btOptimizedBvh) + getAlignmentSerializationPadding();
baseSize += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount; baseSize += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
if (m_useQuantization) if (m_useQuantization)
{ {

2
src/BulletCollision/CollisionShapes/btOptimizedBvh.h
View File

@@ -344,6 +344,8 @@ public:
///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place' ///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian); static btOptimizedBvh *deSerializeInPlace(void *i_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian);
static unsigned int getAlignmentSerializationPadding();
inline bool isQuantized() inline bool isQuantized()
{ {
return m_useQuantization; return m_useQuantization;