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

explicitly deserialize btCapsuleShape date (margin, scaling, halfextents), because the API modifies them

Browse Source
This commit is contained in:
Erwin Coumans
2014-08-26 17:21:08 -07:00
parent a0778a1d49
commit 3c558ec995
6 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/BulletCollision/CollisionShapes/btCapsuleShape.h
View File

@@ -117,6 +117,7 @@ public:
///fills the dataBuffer and returns the struct name (and 0 on failure)
virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const;
SIMD_FORCE_INLINE void deSerializeFloat(struct btCapsuleShapeData* dataBuffer);
};
@@ -181,4 +182,13 @@ SIMD_FORCE_INLINE const char* btCapsuleShape::serialize(void* dataBuffer, btSeri
return "btCapsuleShapeData";
}
SIMD_FORCE_INLINE void btCapsuleShape::deSerializeFloat(btCapsuleShapeData* dataBuffer)
{
m_implicitShapeDimensions.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_implicitShapeDimensions);
m_collisionMargin = dataBuffer->m_convexInternalShapeData.m_collisionMargin;
m_localScaling.deSerializeFloat(dataBuffer->m_convexInternalShapeData.m_localScaling);
//it is best to already pre-allocate the matching btCapsuleShape*(X/Z) version to match m_upAxis
m_upAxis = dataBuffer->m_upAxis;
}
#endif //BT_CAPSULE_SHAPE_H