Changeset 8284 for code/branches/kicklib2/src/external/bullet/LinearMath/btTransform.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (13 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/LinearMath/btTransform.h (modified) (4 diffs)

code/branches/kicklib2/src/external/bullet/LinearMath/btTransform.h

@@ -18 +18 @@
 #define btTransform_H
 
-#include "btVector3.h"
+
 #include "btMatrix3x3.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btTransformData btTransformDoubleData
+#else
+#define btTransformData btTransformFloatData
+#endif
+
+
 
 
@@ -26 +34 @@
 class btTransform {
         
+  ///Storage for the rotation
+        btMatrix3x3 m_basis;
+  ///Storage for the translation
+        btVector3   m_origin;
 
 public:
@@ -196 +208 @@
                 return identityTransform;
         }
-        
-private:
-  ///Storage for the rotation
-        btMatrix3x3 m_basis;
-  ///Storage for the translation
-        btVector3   m_origin;
+
+        void    serialize(struct        btTransformData& dataOut) const;
+
+        void    serializeFloat(struct   btTransformFloatData& dataOut) const;
+
+        void    deSerialize(const struct        btTransformData& dataIn);
+
+        void    deSerializeDouble(const struct  btTransformDoubleData& dataIn);
+
+        void    deSerializeFloat(const struct   btTransformFloatData& dataIn);
+
 };
 
@@ -235 +252 @@
 
 
+///for serialization
+struct  btTransformFloatData
+{
+        btMatrix3x3FloatData    m_basis;
+        btVector3FloatData      m_origin;
+};
+
+struct  btTransformDoubleData
+{
+        btMatrix3x3DoubleData   m_basis;
+        btVector3DoubleData     m_origin;
+};
+
+
+
+SIMD_FORCE_INLINE       void    btTransform::serialize(btTransformData& dataOut) const
+{
+        m_basis.serialize(dataOut.m_basis);
+        m_origin.serialize(dataOut.m_origin);
+}
+
+SIMD_FORCE_INLINE       void    btTransform::serializeFloat(btTransformFloatData& dataOut) const
+{
+        m_basis.serializeFloat(dataOut.m_basis);
+        m_origin.serializeFloat(dataOut.m_origin);
+}
+
+
+SIMD_FORCE_INLINE       void    btTransform::deSerialize(const btTransformData& dataIn)
+{
+        m_basis.deSerialize(dataIn.m_basis);
+        m_origin.deSerialize(dataIn.m_origin);
+}
+
+SIMD_FORCE_INLINE       void    btTransform::deSerializeFloat(const btTransformFloatData& dataIn)
+{
+        m_basis.deSerializeFloat(dataIn.m_basis);
+        m_origin.deSerializeFloat(dataIn.m_origin);
+}
+
+SIMD_FORCE_INLINE       void    btTransform::deSerializeDouble(const btTransformDoubleData& dataIn)
+{
+        m_basis.deSerializeDouble(dataIn.m_basis);
+        m_origin.deSerializeDouble(dataIn.m_origin);
+}
+
+
 #endif