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

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

@@ -15 +15 @@
 
 
-#ifndef CONTINUOUS_COLLISION_CONVEX_CAST_H
-#define CONTINUOUS_COLLISION_CONVEX_CAST_H
+#ifndef BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
+#define BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
 
 #include "btConvexCast.h"
@@ -22 +22 @@
 class btConvexPenetrationDepthSolver;
 class btConvexShape;
+class btStaticPlaneShape;
 
 /// btContinuousConvexCollision implements angular and linear time of impact for convex objects.
@@ -32 +33 @@
         btConvexPenetrationDepthSolver* m_penetrationDepthSolver;
         const btConvexShape*    m_convexA;
-        const btConvexShape*    m_convexB;
+        //second object is either a convex or a plane (code sharing)
+        const btConvexShape*    m_convexB1;
+        const btStaticPlaneShape*       m_planeShape;
 
+        void computeClosestPoints( const btTransform& transA, const btTransform& transB,struct btPointCollector& pointCollector);
 
 public:
 
         btContinuousConvexCollision (const btConvexShape*       shapeA,const btConvexShape*     shapeB ,btSimplexSolverInterface* simplexSolver,btConvexPenetrationDepthSolver* penetrationDepthSolver);
+
+        btContinuousConvexCollision(const btConvexShape*        shapeA,const btStaticPlaneShape*        plane );
 
         virtual bool    calcTimeOfImpact(
@@ -49 +55 @@
 };
 
-#endif //CONTINUOUS_COLLISION_CONVEX_CAST_H
 
+#endif //BT_CONTINUOUS_COLLISION_CONVEX_CAST_H
+