From 1fccfc4e283240e49aa8fefd0149166c67157ed4 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Tue, 16 Sep 2014 20:14:31 -0700 Subject: [PATCH] fix btInMemorySerializer --- src/LinearMath/btSerializer.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/LinearMath/btSerializer.h b/src/LinearMath/btSerializer.h index 00b1e8f71..e57bb245c 100644 --- a/src/LinearMath/btSerializer.h +++ b/src/LinearMath/btSerializer.h @@ -669,11 +669,13 @@ 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. ///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 ///of objects. There will be a demo on how to use the btInMemorySerializer. +#define ENABLE_INMEMORY_SERIALIZER #ifdef ENABLE_INMEMORY_SERIALIZER struct btInMemorySerializer : public btDefaultSerializer @@ -797,7 +799,7 @@ struct btInMemorySerializer : public btDefaultSerializer case BT_CONSTRAINT_CODE: { #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 m_arrays.m_constraintDataFloat.push_back((btTypedConstraintFloatData*)chunk->m_oldPtr); #endif @@ -806,13 +808,13 @@ struct btInMemorySerializer : public btDefaultSerializer case BT_QUANTIZED_BVH_CODE: { #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 m_arrays.m_bvhsFloat.push_back((btQuantizedBvhFloatData*) chunk->m_oldPtr); #endif break; } - + case BT_SHAPE_CODE: { btCollisionShapeData* shapeData = (btCollisionShapeData*) chunk->m_oldPtr;