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

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

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

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

@@ -23 +23 @@
 struct btSimpleBroadphaseProxy : public btBroadphaseProxy
 {
-        btVector3       m_min;
-        btVector3       m_max;
         int                     m_nextFree;
         
@@ -32 +30 @@
         btSimpleBroadphaseProxy() {};
 
-        btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,void* multiSapProxy)
-        :btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy),
-        m_min(minpt),m_max(maxpt)               
+        btSimpleBroadphaseProxy(const btVector3& minpt,const btVector3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,void* multiSapProxy)
+        :btBroadphaseProxy(minpt,maxpt,userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy)
         {
                 (void)shapeType;
@@ -57 +54 @@
         int             m_numHandles;                                           // number of active handles
         int             m_maxHandles;                                           // max number of handles
+        int             m_LastHandleIndex;                                                      
         
         btSimpleBroadphaseProxy* m_pHandles;                                            // handles pool
@@ -69 +67 @@
                 m_firstFreeHandle = m_pHandles[freeHandle].GetNextFree();
                 m_numHandles++;
+                if(freeHandle > m_LastHandleIndex)
+                {
+                        m_LastHandleIndex = freeHandle;
+                }
                 return freeHandle;
         }
@@ -76 +78 @@
                 int handle = int(proxy-m_pHandles);
                 btAssert(handle >= 0 && handle < m_maxHandles);
-
+                if(handle == m_LastHandleIndex)
+                {
+                        m_LastHandleIndex--;
+                }
                 proxy->SetNextFree(m_firstFreeHandle);
                 m_firstFreeHandle = handle;
+
+                proxy->m_clientObject = 0;
 
                 m_numHandles--;
@@ -93 +100 @@
         {
                 btSimpleBroadphaseProxy* proxy0 = static_cast<btSimpleBroadphaseProxy*>(proxy);
+                return proxy0;
+        }
+
+        inline const btSimpleBroadphaseProxy*   getSimpleProxyFromProxy(btBroadphaseProxy* proxy) const
+        {
+                const btSimpleBroadphaseProxy* proxy0 = static_cast<const btSimpleBroadphaseProxy*>(proxy);
                 return proxy0;
         }
@@ -118 +131 @@
         virtual void    destroyProxy(btBroadphaseProxy* proxy,btDispatcher* dispatcher);
         virtual void    setAabb(btBroadphaseProxy* proxy,const btVector3& aabbMin,const btVector3& aabbMax, btDispatcher* dispatcher);
+        virtual void    getAabb(btBroadphaseProxy* proxy,btVector3& aabbMin, btVector3& aabbMax ) const;
+
+        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));
                 
         btOverlappingPairCache* getOverlappingPairCache()