Changeset 1972 for code/branches/physics/src/bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.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/btBroadphaseProxy.h (modified) (3 diffs)

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

@@ -18 +18 @@
 
 #include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
-#include "LinearMath/btVector3.h"
 #include "LinearMath/btAlignedAllocator.h"
 
@@ -92 +91 @@
         };
 
-        btVector3       m_aabbMin;
-        btVector3       m_aabbMax;
-
         //Usually the client btCollisionObject or Rigidbody class
         void*   m_clientObject;
@@ -116 +112 @@
         }
 
-        btBroadphaseProxy(const btVector3& aabbMin,const btVector3& aabbMax,void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
-                :m_aabbMin(aabbMin),
-                m_aabbMax(aabbMax),
-                m_clientObject(userPtr),
+        btBroadphaseProxy(void* userPtr,short int collisionFilterGroup, short int collisionFilterMask,void* multiSapParentProxy=0)
+                :m_clientObject(userPtr),
                 m_collisionFilterGroup(collisionFilterGroup),
                 m_collisionFilterMask(collisionFilterMask)