Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h

Timestamp:

Feb 27, 2011, 7:43:24 AM (14 years ago)

Author:

rgrieder

Message:

Updated Bullet Physics Engine from v2.74 to v2.77

File:

• code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h (modified) (3 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h

@@ -34 +34 @@
                 virtual ~Result(){}     
 
-                ///setShapeIdentifiers provides experimental support for per-triangle material / custom material combiner
-                virtual void setShapeIdentifiers(int partId0,int index0,        int partId1,int index1)=0;
+                ///setShapeIdentifiersA/B provides experimental support for per-triangle material / custom material combiner
+                virtual void setShapeIdentifiersA(int partId0,int index0)=0;
+                virtual void setShapeIdentifiersB(int partId1,int index1)=0;
                 virtual void addContactPoint(const btVector3& normalOnBInWorld,const btVector3& pointInWorld,btScalar depth)=0;
         };
@@ -42 +43 @@
         {
                 ClosestPointInput()
-                        :m_maximumDistanceSquared(btScalar(1e30)),
+                        :m_maximumDistanceSquared(btScalar(BT_LARGE_FLOAT)),
                         m_stackAlloc(0)
                 {
@@ -69 +70 @@
                 btScalar        m_distance; //negative means penetration !
 
-                btStorageResult() : m_distance(btScalar(1e30))
+                btStorageResult() : m_distance(btScalar(BT_LARGE_FLOAT))
                 {