From 725411a1f34fa1ce2325f7c963f8a3168590766d Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 27 Jan 2010 02:41:38 +0000 Subject: [PATCH] added a warning to all serialization structures: ///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 --- src/BulletCollision/CollisionDispatch/btCollisionObject.h | 5 ++--- src/BulletCollision/CollisionShapes/btCapsuleShape.h | 2 +- src/BulletCollision/CollisionShapes/btCollisionShape.h | 2 +- src/BulletCollision/CollisionShapes/btCompoundShape.h | 4 ++-- src/BulletCollision/CollisionShapes/btConvexHullShape.h | 2 +- src/BulletCollision/CollisionShapes/btConvexInternalShape.h | 2 +- src/BulletCollision/CollisionShapes/btCylinderShape.h | 2 +- src/BulletCollision/CollisionShapes/btStaticPlaneShape.h | 1 + .../CollisionShapes/btStridingMeshInterface.h | 2 ++ src/BulletCollision/CollisionShapes/btTriangleMeshShape.h | 2 +- src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h | 1 + .../ConstraintSolver/btGeneric6DofConstraint.h | 1 + src/BulletDynamics/ConstraintSolver/btHingeConstraint.h | 3 ++- .../ConstraintSolver/btPoint2PointConstraint.h | 2 ++ src/BulletDynamics/ConstraintSolver/btSliderConstraint.h | 1 + src/BulletDynamics/ConstraintSolver/btTypedConstraint.h | 2 +- src/BulletDynamics/Dynamics/btRigidBody.h | 3 ++- 17 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/BulletCollision/CollisionDispatch/btCollisionObject.h b/src/BulletCollision/CollisionDispatch/btCollisionObject.h index 569a786c6..0ab4a2afc 100644 --- a/src/BulletCollision/CollisionDispatch/btCollisionObject.h +++ b/src/BulletCollision/CollisionDispatch/btCollisionObject.h @@ -432,9 +432,7 @@ public: }; -///using offsetof for m_vtablePadding might break some compilers, in that case define m_vtablePadding manually - -///for serialization +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCollisionObjectDoubleData { void *m_broadphaseHandle; @@ -465,6 +463,7 @@ struct btCollisionObjectDoubleData char m_padding[4]; }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCollisionObjectFloatData { void *m_broadphaseHandle; diff --git a/src/BulletCollision/CollisionShapes/btCapsuleShape.h b/src/BulletCollision/CollisionShapes/btCapsuleShape.h index cb3edb92c..19541a4ff 100644 --- a/src/BulletCollision/CollisionShapes/btCapsuleShape.h +++ b/src/BulletCollision/CollisionShapes/btCapsuleShape.h @@ -131,7 +131,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCapsuleShapeData { btConvexInternalShapeData m_convexInternalShapeData; diff --git a/src/BulletCollision/CollisionShapes/btCollisionShape.h b/src/BulletCollision/CollisionShapes/btCollisionShape.h index 8ef488d0d..a00759299 100644 --- a/src/BulletCollision/CollisionShapes/btCollisionShape.h +++ b/src/BulletCollision/CollisionShapes/btCollisionShape.h @@ -125,7 +125,7 @@ public: }; -///for serialization +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCollisionShapeData { void *m_userPointer; diff --git a/src/BulletCollision/CollisionShapes/btCompoundShape.h b/src/BulletCollision/CollisionShapes/btCompoundShape.h index 72de27c90..6aed5b33e 100644 --- a/src/BulletCollision/CollisionShapes/btCompoundShape.h +++ b/src/BulletCollision/CollisionShapes/btCompoundShape.h @@ -171,7 +171,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCompoundShapeChildData { btTransformFloatData m_transform; @@ -180,7 +180,7 @@ struct btCompoundShapeChildData float m_childMargin; }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCompoundShapeData { btCollisionShapeData m_collisionShapeData; diff --git a/src/BulletCollision/CollisionShapes/btConvexHullShape.h b/src/BulletCollision/CollisionShapes/btConvexHullShape.h index dc75917da..bf960f4df 100644 --- a/src/BulletCollision/CollisionShapes/btConvexHullShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexHullShape.h @@ -96,7 +96,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btConvexHullShapeData { btConvexInternalShapeData m_convexInternalShapeData; diff --git a/src/BulletCollision/CollisionShapes/btConvexInternalShape.h b/src/BulletCollision/CollisionShapes/btConvexInternalShape.h index b7a2c27c5..125277318 100644 --- a/src/BulletCollision/CollisionShapes/btConvexInternalShape.h +++ b/src/BulletCollision/CollisionShapes/btConvexInternalShape.h @@ -118,7 +118,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btConvexInternalShapeData { btCollisionShapeData m_collisionShapeData; diff --git a/src/BulletCollision/CollisionShapes/btCylinderShape.h b/src/BulletCollision/CollisionShapes/btCylinderShape.h index 8bc4a9a47..5b92b09f6 100644 --- a/src/BulletCollision/CollisionShapes/btCylinderShape.h +++ b/src/BulletCollision/CollisionShapes/btCylinderShape.h @@ -159,7 +159,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btCylinderShapeData { btConvexInternalShapeData m_convexInternalShapeData; diff --git a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h index fd458891e..61dee2dfd 100644 --- a/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h +++ b/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h @@ -66,6 +66,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btStaticPlaneShapeData { btCollisionShapeData m_collisionShapeData; diff --git a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h index 1c7c30a76..d2cc7f711 100644 --- a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h @@ -109,6 +109,7 @@ struct btShortIntIndexData short int m_value; }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btMeshPartData { btVector3FloatData *m_vertices3f; @@ -121,6 +122,7 @@ struct btMeshPartData }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btStridingMeshInterfaceData { btMeshPartData *m_meshPartsPtr; diff --git a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h index b46d2e0bd..cb6de546c 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMeshShape.h @@ -88,7 +88,7 @@ public: }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btTriangleMeshShapeData { btCollisionShapeData m_collisionShapeData; diff --git a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h index fa1e69b56..24827a6ba 100644 --- a/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h @@ -264,6 +264,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btConeTwistConstraintData { btTypedConstraintData m_typeConstraintData; diff --git a/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h index e13ea638b..bf0f3d731 100644 --- a/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h @@ -507,6 +507,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btGeneric6DofConstraintData { btTypedConstraintData m_typeConstraintData; diff --git a/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h index 6d03254c2..a43ab654d 100644 --- a/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h @@ -240,6 +240,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btHingeConstraintDoubleData { btTypedConstraintData m_typeConstraintData; @@ -258,7 +259,7 @@ struct btHingeConstraintDoubleData float m_relaxationFactor; }; - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btHingeConstraintFloatData { btTypedConstraintData m_typeConstraintData; diff --git a/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h index a530c8e8d..baf94fc55 100644 --- a/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h @@ -112,6 +112,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btPoint2PointConstraintFloatData { btTypedConstraintData m_typeConstraintData; @@ -119,6 +120,7 @@ struct btPoint2PointConstraintFloatData btVector3FloatData m_pivotInB; }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btPoint2PointConstraintDoubleData { btTypedConstraintData m_typeConstraintData; diff --git a/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h b/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h index 25421e412..3519b1673 100755 --- a/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h @@ -239,6 +239,7 @@ public: }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btSliderConstraintData { btTypedConstraintData m_typeConstraintData; diff --git a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h index 33deacd85..43227e056 100644 --- a/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h +++ b/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h @@ -282,7 +282,7 @@ SIMD_FORCE_INLINE btScalar btAdjustAngleToLimits(btScalar angleInRadians, btScal } } - +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btTypedConstraintData { btRigidBodyData *m_rbA; diff --git a/src/BulletDynamics/Dynamics/btRigidBody.h b/src/BulletDynamics/Dynamics/btRigidBody.h index a807ef315..708b2251e 100644 --- a/src/BulletDynamics/Dynamics/btRigidBody.h +++ b/src/BulletDynamics/Dynamics/btRigidBody.h @@ -513,7 +513,7 @@ public: }; //@todo add m_optionalMotionState and m_constraintRefs to btRigidBodyData -///btRigidBodyData is used for btRigidBody serialization +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btRigidBodyFloatData { btCollisionObjectFloatData m_collisionObjectData; @@ -539,6 +539,7 @@ struct btRigidBodyFloatData int m_additionalDamping; }; +///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64 struct btRigidBodyDoubleData { btCollisionObjectDoubleData m_collisionObjectData;