Changeset 8351 for code/trunk/src/external/bullet/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

Timestamp:

Apr 28, 2011, 7:15:14 AM (13 years ago)

Author:

rgrieder

Message:

Merged kicklib2 branch back to trunk (includes former branches ois_update, mac_osx and kicklib).

Notes for updating

Linux:
You don't need an extra package for CEGUILua and Tolua, it's already shipped with CEGUI.
However you do need to make sure that the OgreRenderer is installed too with CEGUI 0.7 (may be a separate package).
Also, Orxonox now recognises if you install the CgProgramManager (a separate package available on newer Ubuntu on Debian systems).

Windows:
Download the new dependency packages versioned 6.0 and use these. If you have problems with that or if you don't like the in game console problem mentioned below, you can download the new 4.3 version of the packages (only available for Visual Studio 2005/2008).

Key new features:

• *Support for Mac OS X*
• Visual Studio 2010 support
• Bullet library update to 2.77
• OIS library update to 1.3
• Support for CEGUI 0.7 —> Support for Arch Linux and even SuSE
• Improved install target
• Compiles now with GCC 4.6
• Ogre Cg Shader plugin activated for Linux if available
• And of course lots of bug fixes

There are also some regressions:

• No support for CEGUI 0.5, Ogre 1.4 and boost 1.35 - 1.39 any more
• In game console is not working in main menu for CEGUI 0.7
• Tolua (just the C lib, not the application) and CEGUILua libraries are no longer in our repository. —> You will need to get these as well when compiling Orxonox
• And of course lots of new bugs we don't yet know about

File:

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

code/trunk/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