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

Change to make serializing btOptimizedBvh/btQuantizedBvh properly deterministic. Contributed by reltham.

Browse Source
This commit is contained in:
john.mccutchan
2008-09-29 21:17:37 +00:00
parent e590f4a721
commit 41b6eaa87f
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
View File

@@ -726,7 +726,8 @@ static const unsigned BVH_ALIGNMENT_BLOCKS = 2;
unsigned int btQuantizedBvh::getAlignmentSerializationPadding() unsigned int btQuantizedBvh::getAlignmentSerializationPadding()
{ {
return BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT; // I changed this to 0 since the extra padding is not needed or used.
return 0;//BVH_ALIGNMENT_BLOCKS * BVH_ALIGNMENT;
} }
unsigned btQuantizedBvh::calculateSerializeBufferSize() unsigned btQuantizedBvh::calculateSerializeBufferSize()
@@ -829,6 +830,11 @@ bool btQuantizedBvh::serialize(void *o_alignedDataBuffer, unsigned /*i_dataBuffe
} }
} }
nodeData += sizeof(btQuantizedBvhNode) * nodeCount; nodeData += sizeof(btQuantizedBvhNode) * nodeCount;
// this clears the pointer in the member variable it doesn't really do anything to the data
// it does call the destructor on the contained objects, but they are all classes with no destructor defined
// so the memory (which is not freed) is left alone
targetBvh->m_quantizedContiguousNodes.initializeFromBuffer(NULL, 0, 0);
} }
else else
{ {
@@ -859,6 +865,11 @@ bool btQuantizedBvh::serialize(void *o_alignedDataBuffer, unsigned /*i_dataBuffe
} }
} }
nodeData += sizeof(btOptimizedBvhNode) * nodeCount; nodeData += sizeof(btOptimizedBvhNode) * nodeCount;
// this clears the pointer in the member variable it doesn't really do anything to the data
// it does call the destructor on the contained objects, but they are all classes with no destructor defined
// so the memory (which is not freed) is left alone
targetBvh->m_contiguousNodes.initializeFromBuffer(NULL, 0, 0);
} }
sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK; sizeToAdd = 0;//(BVH_ALIGNMENT-((unsigned)nodeData & BVH_ALIGNMENT_MASK))&BVH_ALIGNMENT_MASK;
@@ -896,12 +907,23 @@ bool btQuantizedBvh::serialize(void *o_alignedDataBuffer, unsigned /*i_dataBuffe
targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex); targetBvh->m_SubtreeHeaders[i].m_rootNodeIndex = (m_SubtreeHeaders[i].m_rootNodeIndex);
targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize); targetBvh->m_SubtreeHeaders[i].m_subtreeSize = (m_SubtreeHeaders[i].m_subtreeSize);
targetBvh->m_SubtreeHeaders[i] = m_SubtreeHeaders[i];
// need to clear padding in destination buffer
targetBvh->m_SubtreeHeaders[i].m_padding[0] = 0;
targetBvh->m_SubtreeHeaders[i].m_padding[1] = 0;
targetBvh->m_SubtreeHeaders[i].m_padding[2] = 0;
} }
} }
nodeData += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount; nodeData += sizeof(btBvhSubtreeInfo) * m_subtreeHeaderCount;
// this clears the pointer in the member variable it doesn't really do anything to the data
// it does call the destructor on the contained objects, but they are all classes with no destructor defined
// so the memory (which is not freed) is left alone
targetBvh->m_SubtreeHeaders.initializeFromBuffer(NULL, 0, 0);
// this wipes the virtual function table pointer at the start of the buffer for the class
*((void**)o_alignedDataBuffer) = NULL;
return true; return true;
} }