Changeset 2882 for code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h (modified) (10 diffs)

code/trunk/src/bullet/BulletCollision/BroadphaseCollision/btAxisSweep3.h

@@ -43 +43 @@
 public:
         
+ BT_DECLARE_ALIGNED_ALLOCATOR();
 
         class Edge
@@ -139 +140 @@
         SIMD_FORCE_INLINE Handle* getHandle(BP_FP_INT_TYPE index) const {return m_pHandles + index;}
 
-        void resetPool();
+        virtual void resetPool(btDispatcher* dispatcher);
 
         void    processAllOverlappingPairs(btOverlapCallback* callback);
@@ -221 +222 @@
 
         if (checkCardinality)
-                assert(numEdges == m_numHandles*2+1);
+                btAssert(numEdges == m_numHandles*2+1);
 }
 #endif //DEBUG_BROADPHASE
@@ -347 +348 @@
         }
 
-        //assert(bounds.HasVolume());
+        //btAssert(bounds.HasVolume());
 
         // init bounds
@@ -453 +454 @@
 BP_FP_INT_TYPE btAxisSweep3Internal<BP_FP_INT_TYPE>::allocHandle()
 {
-        assert(m_firstFreeHandle);
+        btAssert(m_firstFreeHandle);
 
         BP_FP_INT_TYPE handle = m_firstFreeHandle;
@@ -465 +466 @@
 void btAxisSweep3Internal<BP_FP_INT_TYPE>::freeHandle(BP_FP_INT_TYPE handle)
 {
-        assert(handle > 0 && handle < m_maxHandles);
+        btAssert(handle > 0 && handle < m_maxHandles);
 
         getHandle(handle)->SetNextFree(m_firstFreeHandle);
@@ -588 +589 @@
 
 template <typename BP_FP_INT_TYPE>
-void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool()
+void btAxisSweep3Internal<BP_FP_INT_TYPE>::resetPool(btDispatcher* dispatcher)
 {
         if (m_numHandles == 0)
@@ -642 +643 @@
                         if (!isDuplicate)
                         {
+                                ///important to use an AABB test that is consistent with the broadphase
                                 bool hasOverlap = testAabbOverlap(pair.m_pProxy0,pair.m_pProxy1);
 
@@ -687 +689 @@
         }
 
-
-
-        
-
 }
 
@@ -731 +729 @@
 void btAxisSweep3Internal<BP_FP_INT_TYPE>::updateHandle(BP_FP_INT_TYPE handle, const btVector3& aabbMin,const btVector3& aabbMax,btDispatcher* dispatcher)
 {
-//      assert(bounds.IsFinite());
-        //assert(bounds.HasVolume());
+//      btAssert(bounds.IsFinite());
+        //btAssert(bounds.HasVolume());
 
         Handle* pHandle = getHandle(handle);