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

code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h

@@ -14 +14 @@
 */
 
-#ifndef RAYCAST_TRI_CALLBACK_H
-#define RAYCAST_TRI_CALLBACK_H
+#ifndef BT_RAYCAST_TRI_CALLBACK_H
+#define BT_RAYCAST_TRI_CALLBACK_H
 
 #include "BulletCollision/CollisionShapes/btTriangleCallback.h"
@@ -59 +59 @@
         btTransform m_triangleToWorld;
         btScalar m_hitFraction;
-    btScalar m_triangleCollisionMargin;
+        btScalar m_triangleCollisionMargin;
+        btScalar m_allowedPenetration;
 
         btTriangleConvexcastCallback (const btConvexShape* convexShape, const btTransform& convexShapeFrom, const btTransform& convexShapeTo, const btTransform& triangleToWorld, const btScalar triangleCollisionMargin);
@@ -68 +69 @@
 };
 
-#endif //RAYCAST_TRI_CALLBACK_H
+#endif //BT_RAYCAST_TRI_CALLBACK_H