Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h

Timestamp:

May 3, 2011, 5:07:42 AM (13 years ago)

Author:

rgrieder

Message:

Updated Bullet from v2.77 to v2.78.
(I'm not going to make a branch for that since the update from 2.74 to 2.77 hasn't been tested that much either).

You will HAVE to do a complete RECOMPILE! I tested with MSVC and MinGW and they both threw linker errors at me.

File:

• code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h (modified) (3 diffs)

code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h

@@ -14 +14 @@
 */
 
-#ifndef BU_SHAPE
-#define BU_SHAPE
+#ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H
+#define BT_POLYHEDRAL_CONVEX_SHAPE_H
 
 #include "LinearMath/btMatrix3x3.h"
 #include "btConvexInternalShape.h"
+class btConvexPolyhedron;
 
 
@@ -24 +25 @@
 class btPolyhedralConvexShape : public btConvexInternalShape
 {
+        
 
 protected:
         
+        btConvexPolyhedron* m_polyhedron;
+
 public:
 
         btPolyhedralConvexShape();
+
+        virtual ~btPolyhedralConvexShape();
+
+        ///optional method mainly used to generate multiple contact points by clipping polyhedral features (faces/edges)
+        virtual bool    initializePolyhedralFeatures();
+
+        const btConvexPolyhedron*       getConvexPolyhedron() const
+        {
+                return m_polyhedron;
+        }
 
         //brute force implementations
@@ -96 +110 @@
 };
 
-#endif //BU_SHAPE
+#endif //BT_POLYHEDRAL_CONVEX_SHAPE_H