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

Timestamp:

Oct 20, 2008, 5:40:38 PM (17 years ago)

Author:

rgrieder

Message:

Downgraded Bullet to latest tagged version: 2.72
That should give us more stability.

File:

• code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btSimpleBroadphase.h (modified) (4 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;
         
@@ -31 +33 @@
 
         btSimpleBroadphaseProxy(const btPoint3& minpt,const btPoint3& maxpt,int shapeType,void* userPtr,short int collisionFilterGroup,short int collisionFilterMask,void* multiSapProxy)
-        :btBroadphaseProxy(minpt,maxpt,userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy)
+        :btBroadphaseProxy(userPtr,collisionFilterGroup,collisionFilterMask,multiSapProxy),
+        m_min(minpt),m_max(maxpt)               
         {
                 (void)shapeType;
@@ -93 +96 @@
         }
 
-        inline const btSimpleBroadphaseProxy*   getSimpleProxyFromProxy(btBroadphaseProxy* proxy) const
-        {
-                const btSimpleBroadphaseProxy* proxy0 = static_cast<const btSimpleBroadphaseProxy*>(proxy);
-                return proxy0;
-        }
-
 
         void    validate();
@@ -121 +118 @@
         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);
                 
         btOverlappingPairCache* getOverlappingPairCache()