Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h (modified) (6 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

@@ -17 +17 @@
 #define QUANTIZED_BVH_H
 
+class btSerializer;
+
 //#define DEBUG_CHECK_DEQUANTIZATION 1
 #ifdef DEBUG_CHECK_DEQUANTIZATION
@@ -29 +31 @@
 #include "LinearMath/btVector3.h"
 #include "LinearMath/btAlignedAllocator.h"
+
+#ifdef BT_USE_DOUBLE_PRECISION
+#define btQuantizedBvhData btQuantizedBvhDoubleData
+#define btOptimizedBvhNodeData btOptimizedBvhNodeDoubleData
+#define btQuantizedBvhDataName "btQuantizedBvhDoubleData"
+#else
+#define btQuantizedBvhData btQuantizedBvhFloatData
+#define btOptimizedBvhNodeData btOptimizedBvhNodeFloatData
+#define btQuantizedBvhDataName "btQuantizedBvhFloatData"
+#endif
+
 
 
@@ -191 +204 @@
 
         //This is only used for serialization so we don't have to add serialization directly to btAlignedObjectArray
-        int m_subtreeHeaderCount;
+        mutable int m_subtreeHeaderCount;
 
         
@@ -444 +457 @@
         }
 
+////////////////////////////////////////////////////////////////////
 
         /////Calculate space needed to store BVH for serialization
-        unsigned calculateSerializeBufferSize();
+        unsigned calculateSerializeBufferSize() const;
 
         /// Data buffer MUST be 16 byte aligned
-        virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian);
+        virtual bool serialize(void *o_alignedDataBuffer, unsigned i_dataBufferSize, bool i_swapEndian) const;
 
         ///deSerializeInPlace loads and initializes a BVH from a buffer in memory 'in place'
@@ -455 +469 @@
 
         static unsigned int getAlignmentSerializationPadding();
+//////////////////////////////////////////////////////////////////////
+
+        
+        virtual int     calculateSerializeBufferSizeNew() const;
+
+        ///fills the dataBuffer and returns the struct name (and 0 on failure)
+        virtual const char*     serialize(void* dataBuffer, btSerializer* serializer) const;
+
+        virtual void deSerializeFloat(struct btQuantizedBvhFloatData& quantizedBvhFloatData);
+
+        virtual void deSerializeDouble(struct btQuantizedBvhDoubleData& quantizedBvhDoubleData);
+
+
+////////////////////////////////////////////////////////////////////
 
         SIMD_FORCE_INLINE bool isQuantized()
@@ -471 +499 @@
 
 
+struct  btBvhSubtreeInfoData
+{
+        int                     m_rootNodeIndex;
+        int                     m_subtreeSize;
+        unsigned short m_quantizedAabbMin[3];
+        unsigned short m_quantizedAabbMax[3];
+};
+
+struct btOptimizedBvhNodeFloatData
+{
+        btVector3FloatData      m_aabbMinOrg;
+        btVector3FloatData      m_aabbMaxOrg;
+        int     m_escapeIndex;
+        int     m_subPart;
+        int     m_triangleIndex;
+        char m_pad[4];
+};
+
+struct btOptimizedBvhNodeDoubleData
+{
+        btVector3DoubleData     m_aabbMinOrg;
+        btVector3DoubleData     m_aabbMaxOrg;
+        int     m_escapeIndex;
+        int     m_subPart;
+        int     m_triangleIndex;
+        char    m_pad[4];
+};
+
+
+struct btQuantizedBvhNodeData
+{
+        unsigned short m_quantizedAabbMin[3];
+        unsigned short m_quantizedAabbMax[3];
+        int     m_escapeIndexOrTriangleIndex;
+};
+
+struct  btQuantizedBvhFloatData
+{
+        btVector3FloatData                      m_bvhAabbMin;
+        btVector3FloatData                      m_bvhAabbMax;
+        btVector3FloatData                      m_bvhQuantization;
+        int                                     m_curNodeIndex;
+        int                                     m_useQuantization;
+        int                                     m_numContiguousLeafNodes;
+        int                                     m_numQuantizedContiguousNodes;
+        btOptimizedBvhNodeFloatData     *m_contiguousNodesPtr;
+        btQuantizedBvhNodeData          *m_quantizedContiguousNodesPtr;
+        btBvhSubtreeInfoData    *m_subTreeInfoPtr;
+        int                                     m_traversalMode;
+        int                                     m_numSubtreeHeaders;
+        
+};
+
+struct  btQuantizedBvhDoubleData
+{
+        btVector3DoubleData                     m_bvhAabbMin;
+        btVector3DoubleData                     m_bvhAabbMax;
+        btVector3DoubleData                     m_bvhQuantization;
+        int                                                     m_curNodeIndex;
+        int                                                     m_useQuantization;
+        int                                                     m_numContiguousLeafNodes;
+        int                                                     m_numQuantizedContiguousNodes;
+        btOptimizedBvhNodeDoubleData    *m_contiguousNodesPtr;
+        btQuantizedBvhNodeData                  *m_quantizedContiguousNodesPtr;
+
+        int                                                     m_traversalMode;
+        int                                                     m_numSubtreeHeaders;
+        btBvhSubtreeInfoData            *m_subTreeInfoPtr;
+};
+
+
+SIMD_FORCE_INLINE       int     btQuantizedBvh::calculateSerializeBufferSizeNew() const
+{
+        return sizeof(btQuantizedBvhData);
+}
+
+
+
 #endif //QUANTIZED_BVH_H