Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/CollisionShapes/btBoxShape.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/btBoxShape.h (modified) (3 diffs)

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

@@ -14 +14 @@
 */
 
-#ifndef OBB_BOX_MINKOWSKI_H
-#define OBB_BOX_MINKOWSKI_H
+#ifndef BT_OBB_BOX_MINKOWSKI_H
+#define BT_OBB_BOX_MINKOWSKI_H
 
 #include "btPolyhedralConvexShape.h"
@@ -146 +146 @@
         virtual void getVertex(int i,btVector3& vtx) const
         {
-                btVector3 halfExtents = getHalfExtentsWithoutMargin();
+                btVector3 halfExtents = getHalfExtentsWithMargin();
 
                 vtx = btVector3(
@@ -314 +314 @@
 
 
-#endif //OBB_BOX_MINKOWSKI_H
-
-
+#endif //BT_OBB_BOX_MINKOWSKI_H
+
+