Changeset 8284 for code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp

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/BroadphaseCollision/btSimpleBroadphase.cpp (modified) (2 diffs)

code/branches/kicklib2/src/external/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp

@@ -21 +21 @@
 #include "LinearMath/btTransform.h"
 #include "LinearMath/btMatrix3x3.h"
+#include "LinearMath/btAabbUtil2.h"
+
 #include <new>
 
@@ -163 +165 @@
                 }
                 rayCallback.process(proxy);
+        }
+}
+
+
+void    btSimpleBroadphase::aabbTest(const btVector3& aabbMin, const btVector3& aabbMax, btBroadphaseAabbCallback& callback)
+{
+        for (int i=0; i <= m_LastHandleIndex; i++)
+        {
+                btSimpleBroadphaseProxy* proxy = &m_pHandles[i];
+                if(!proxy->m_clientObject)
+                {
+                        continue;
+                }
+                if (TestAabbAgainstAabb2(aabbMin,aabbMax,proxy->m_aabbMin,proxy->m_aabbMax))
+                {
+                        callback.process(proxy);
+                }
         }
 }