Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h (modified) (4 diffs)

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

@@ -84 +84 @@
 
         virtual void    setInternalGhostPairCallback(btOverlappingPairCallback* ghostPairCallback)=0;
+
+        virtual void    sortOverlappingPairs(btDispatcher* dispatcher) = 0;
+
 
 };
@@ -260 +263 @@
         }
 
-public:
+        virtual void    sortOverlappingPairs(btDispatcher* dispatcher);
+        
+
+protected:
         
         btAlignedObjectArray<int>       m_hashTable;
@@ -370 +376 @@
                 }
 
+                virtual void    sortOverlappingPairs(btDispatcher* dispatcher);
+                
 
 };
@@ -448 +456 @@
         }
         
+        virtual void    sortOverlappingPairs(btDispatcher* dispatcher)
+        {
+        }