Changeset 7983 for code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.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/BroadphaseCollision/btBroadphaseInterface.h (modified) (4 diffs)

code/branches/kicklib/src/external/bullet/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h

@@ -27 +27 @@
 
 
-struct  btBroadphaseRayCallback
+struct  btBroadphaseAabbCallback
+{
+        virtual ~btBroadphaseAabbCallback() {}
+        virtual bool    process(const btBroadphaseProxy* proxy) = 0;
+};
+
+
+struct  btBroadphaseRayCallback : public btBroadphaseAabbCallback
 {
         ///added some cached data to accelerate ray-AABB tests
@@ -35 +42 @@
 
         virtual ~btBroadphaseRayCallback() {}
-        virtual bool    process(const btBroadphaseProxy* proxy) = 0;
 };
 
@@ -55 +61 @@
         virtual void    rayTest(const btVector3& rayFrom,const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin=btVector3(0,0,0), const btVector3& aabbMax = btVector3(0,0,0)) = 0;
 
+        virtual void    aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback) = 0;
+
         ///calculateOverlappingPairs is optional: incremental algorithms (sweep and prune) might do it during the set aabb
         virtual void    calculateOverlappingPairs(btDispatcher* dispatcher)=0;
@@ -66 +74 @@
 
         ///reset broadphase internal structures, to ensure determinism/reproducability
-        virtual void resetPool(btDispatcher* dispatcher) {};
+        virtual void resetPool(btDispatcher* dispatcher) { (void) dispatcher; };
 
         virtual void    printStats() = 0;