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

Merge pull request #248 from erwincoumans/master

Browse Source 
fix btInMemorySerializer but disable btInMemorySerializer by default
This commit is contained in:
erwincoumans
2014-09-16 20:17:51 -07:00
parent dd526e7da9 4352eb1ea4
commit 065091bd12
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/LinearMath/btSerializer.h
View File

@@ -669,7 +669,8 @@ public:
} }
}; };
///In general it is best to use btDefaultSerializer,
///In general it is best to use btDefaultSerializer,
///in particular when writing the data to disk or sending it over the network. ///in particular when writing the data to disk or sending it over the network.
///The btInMemorySerializer is experimental and only suitable in a few cases. ///The btInMemorySerializer is experimental and only suitable in a few cases.
///The btInMemorySerializer takes a shortcut and can be useful to create a deep-copy ///The btInMemorySerializer takes a shortcut and can be useful to create a deep-copy
@@ -797,7 +798,7 @@ struct btInMemorySerializer : public btDefaultSerializer
case BT_CONSTRAINT_CODE: case BT_CONSTRAINT_CODE:
{ {
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
m_arrays.m_constraintDataDouble.push_back(btTypedConstraintDoubleData*)chunk->m_oldPtr); m_arrays.m_constraintDataDouble.push_back((btTypedConstraintDoubleData*)chunk->m_oldPtr);
#else #else
m_arrays.m_constraintDataFloat.push_back((btTypedConstraintFloatData*)chunk->m_oldPtr); m_arrays.m_constraintDataFloat.push_back((btTypedConstraintFloatData*)chunk->m_oldPtr);
#endif #endif
@@ -806,13 +807,13 @@ struct btInMemorySerializer : public btDefaultSerializer
case BT_QUANTIZED_BVH_CODE: case BT_QUANTIZED_BVH_CODE:
{ {
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
m_arrays.m_bvhsFloat.push_back((btQuantizedBvhDoubleData*) chunk->m_oldPtr); m_arrays.m_bvhsDouble.push_back((btQuantizedBvhDoubleData*) chunk->m_oldPtr);
#else #else
m_arrays.m_bvhsFloat.push_back((btQuantizedBvhFloatData*) chunk->m_oldPtr); m_arrays.m_bvhsFloat.push_back((btQuantizedBvhFloatData*) chunk->m_oldPtr);
#endif #endif
break; break;
} }
case BT_SHAPE_CODE: case BT_SHAPE_CODE:
{ {
btCollisionShapeData* shapeData = (btCollisionShapeData*) chunk->m_oldPtr; btCollisionShapeData* shapeData = (btCollisionShapeData*) chunk->m_oldPtr;