Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h

Timestamp:

Dec 13, 2008, 11:45:51 PM (15 years ago)

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) (7 diffs)

code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h

@@ -22 +22 @@
 #include "btOverlappingPairCallback.h"
 
-#include "LinearMath/btPoint3.h"
 #include "LinearMath/btAlignedObjectArray.h"
 class btDispatcher;
@@ -83 +82 @@
 
         virtual bool    hasDeferredRemoval() = 0;
+
+        virtual void    setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback)=0;
 
 };
@@ -254 +255 @@
         }
 
+        virtual void    setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback)
+        {
+                m_ghostPairCallback = ghostPairCallback;
+        }
+
 public:
         
         btAlignedObjectArray<int>       m_hashTable;
         btAlignedObjectArray<int>       m_next;
+        btOverlappingPairCallback*      m_ghostPairCallback;
         
 };
@@ -280 +287 @@
                 //if set, use the callback instead of the built in filter in needBroadphaseCollision
                 btOverlapFilterCallback* m_overlapFilterCallback;
+
+                btOverlappingPairCallback*      m_ghostPairCallback;
 
         public:
@@ -356 +365 @@
                 }
 
-
-};
-
-
-
-///btNullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and testing.
+                virtual void    setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback)
+                {
+                        m_ghostPairCallback = ghostPairCallback;
+                }
+
+
+};
+
+
+
+///btNullPairCache skips add/removal of overlapping pairs. Userful for benchmarking and unit testing.
 class btNullPairCache : public btOverlappingPairCache
 {
@@ -415 +429 @@
         }
 
+        virtual void    setInternalGhostPairCallback(btOverlappingPairCallback* /* ghostPairCallback */)
+        {
+
+        }
+
         virtual btBroadphasePair*       addOverlappingPair(btBroadphaseProxy* /*proxy0*/,btBroadphaseProxy* /*proxy1*/)
         {
@@ -428 +447 @@
         {
         }
+