Changeset 8393 for code/trunk/src/external/bullet/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp

Timestamp:

May 3, 2011, 5:07:42 AM (14 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.cpp (modified) (2 diffs)

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

@@ -125 +125 @@
         m_convexShapeTo = convexShapeTo;
         m_triangleToWorld = triangleToWorld;
-        m_hitFraction = 1.0;
-    m_triangleCollisionMargin = triangleCollisionMargin;
+        m_hitFraction = 1.0f;
+        m_triangleCollisionMargin = triangleCollisionMargin;
+        m_allowedPenetration = 0.f;
 }
 
@@ -149 +150 @@
         btConvexCast::CastResult castResult;
         castResult.m_fraction = btScalar(1.);
+        castResult.m_allowedPenetration = m_allowedPenetration;
         if (convexCaster.calcTimeOfImpact(m_convexShapeFrom,m_convexShapeTo,m_triangleToWorld, m_triangleToWorld, castResult))
         {