Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h

Timestamp:

Apr 21, 2011, 6:58:23 PM (14 years ago)

Author:

rgrieder

Message:

Merged revisions 7978 - 8096 from kicklib to kicklib2.

Location:

code/branches/kicklib2

Files:

• . (modified) (1 prop)
• src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h (modified) (1 diff)

code/branches/kicklib2/src/external/bullet/BulletCollision/NarrowPhaseCollision/btPointCollector.h

@@ -32 +32 @@
 
         btPointCollector () 
-                : m_distance(btScalar(1e30)),m_hasResult(false)
+                : m_distance(btScalar(BT_LARGE_FLOAT)),m_hasResult(false)
         {
         }
 
-        virtual void setShapeIdentifiers(int partId0,int index0,        int partId1,int index1)
+        virtual void setShapeIdentifiersA(int partId0,int index0)
         {
                 (void)partId0;
                 (void)index0;
+                        
+        }
+        virtual void setShapeIdentifiersB(int partId1,int index1)
+        {
                 (void)partId1;
                 (void)index1;
-                //??
         }