Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.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/CollisionShapes/btBvhTriangleMeshShape.h (modified) (6 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h

@@ -1 +1 @@
 /*
 Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans  http://continuousphysics.com/Bullet/
+Copyright (c) 2003-2009 Erwin Coumans  http://bulletphysics.org
 
 This software is provided 'as-is', without any express or implied warranty.
@@ -20 +20 @@
 #include "btOptimizedBvh.h"
 #include "LinearMath/btAlignedAllocator.h"
-
+#include "btTriangleInfoMap.h"
 
 ///The btBvhTriangleMeshShape is a static-triangle mesh shape with several optimizations, such as bounding volume hierarchy and cache friendly traversal for PlayStation 3 Cell SPU. It is recommended to enable useQuantizedAabbCompression for better memory usage.
@@ -30 +30 @@
 
         btOptimizedBvh* m_bvh;
+        btTriangleInfoMap*      m_triangleInfoMap;
+
         bool m_useQuantizedAabbCompression;
         bool m_ownsBvh;
@@ -38 +40 @@
         BT_DECLARE_ALIGNED_ALLOCATOR();
 
-        btBvhTriangleMeshShape() : btTriangleMeshShape(0),m_bvh(0),m_ownsBvh(false) {m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;};
+        btBvhTriangleMeshShape() : btTriangleMeshShape(0),m_bvh(0),m_triangleInfoMap(0),m_ownsBvh(false) {m_shapeType = TRIANGLE_MESH_SHAPE_PROXYTYPE;};
         btBvhTriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression, bool buildBvh = true);
 
@@ -74 +76 @@
         }
 
+        void    setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& localScaling=btVector3(1,1,1));
 
-        void    setOptimizedBvh(btOptimizedBvh* bvh, const btVector3& localScaling=btVector3(1,1,1));
+        void    buildOptimizedBvh();
 
         bool    usesQuantizedAabbCompression() const
@@ -81 +84 @@
                 return  m_useQuantizedAabbCompression;
         }
+
+        void    setTriangleInfoMap(btTriangleInfoMap* triangleInfoMap)
+        {
+                m_triangleInfoMap = triangleInfoMap;
+        }
+
+        const btTriangleInfoMap*        getTriangleInfoMap() const
+        {
+                return m_triangleInfoMap;
+        }
+        
+        btTriangleInfoMap*      getTriangleInfoMap()
+        {
+                return m_triangleInfoMap;
+        }
+
+        virtual int     calculateSerializeBufferSize() const;
+
+        ///fills the dataBuffer and returns the struct name (and 0 on failure)
+        virtual const char*     serialize(void* dataBuffer, btSerializer* serializer) const;
+
+        virtual void    serializeSingleBvh(btSerializer* serializer) const;
+
+        virtual void    serializeSingleTriangleInfoMap(btSerializer* serializer) const;
+
+};
+
+///do not change those serialization structures, it requires an updated sBulletDNAstr/sBulletDNAstr64
+struct  btTriangleMeshShapeData
+{
+        btCollisionShapeData    m_collisionShapeData;
+
+        btStridingMeshInterfaceData m_meshInterface;
+
+        btQuantizedBvhFloatData         *m_quantizedFloatBvh;
+        btQuantizedBvhDoubleData        *m_quantizedDoubleBvh;
+
+        btTriangleInfoMapData   *m_triangleInfoMap;
+        
+        float   m_collisionMargin;
+
+        char m_pad3[4];
+        
+};
+
+
+SIMD_FORCE_INLINE       int     btBvhTriangleMeshShape::calculateSerializeBufferSize() const
+{
+        return sizeof(btTriangleMeshShapeData);
 }
-;
+
+
 
 #endif //BVH_TRIANGLE_MESH_SHAPE_H