Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp

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

code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp

@@ -150 +150 @@
 
 
+void    btMultiSapBroadphase::getAabb(btBroadphaseProxy* proxy,btVector3& aabbMin, btVector3& aabbMax ) const
+{
+        btMultiSapProxy* multiProxy = static_cast<btMultiSapProxy*>(proxy);
+        aabbMin = multiProxy->m_aabbMin;
+        aabbMax = multiProxy->m_aabbMax;
+}
+
+void    btMultiSapBroadphase::rayTest(const btVector3& rayFrom,const btVector3& rayTo, btBroadphaseRayCallback& rayCallback, const btVector3& aabbMin,const btVector3& aabbMax)
+{
+        for (int i=0;i<m_multiSapProxies.size();i++)
+        {
+                rayCallback.process(m_multiSapProxies[i]);
+        }
+}
+
+
 //#include <stdio.h>
 
@@ -209 +225 @@
 
         
-        m_optimizedAabbTree->reportAabbOverlappingNodex(&myNodeCallback,aabbMin,aabbMax);
+        if (m_optimizedAabbTree)
+                m_optimizedAabbTree->reportAabbOverlappingNodex(&myNodeCallback,aabbMin,aabbMax);
+
         int i;