Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp (modified) (4 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp

@@ -144 +144 @@
 
 
-void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects)
+void btSimulationIslandManager::buildIslands(btDispatcher* dispatcher,btCollisionWorld* collisionWorld)
 {
 
         BT_PROFILE("islandUnionFindAndQuickSort");
         
+        btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+
         m_islandmanifold.resize(0);
 
@@ -239 +241 @@
                                         {
                                                 colObj0->setActivationState( WANTS_DEACTIVATION);
+                                                colObj0->setDeactivationTime(0.f);
                                         }
                                 }
@@ -263 +266 @@
                  btCollisionObject* colObj1 = static_cast<btCollisionObject*>(manifold->getBody1());
                 
-                 //todo: check sleeping conditions!
+                 ///@todo: check sleeping conditions!
                  if (((colObj0) && colObj0->getActivationState() != ISLAND_SLEEPING) ||
                         ((colObj1) && colObj1->getActivationState() != ISLAND_SLEEPING))
@@ -288 +291 @@
 
 
-//
-// todo: this is random access, it can be walked 'cache friendly'!
-//
-void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionObjectArray& collisionObjects, IslandCallback* callback)
-{
-
-        buildIslands(dispatcher,collisionObjects);
+///@todo: this is random access, it can be walked 'cache friendly'!
+void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher,btCollisionWorld* collisionWorld, IslandCallback* callback)
+{
+        btCollisionObjectArray& collisionObjects = collisionWorld->getCollisionObjectArray();
+
+        buildIslands(dispatcher,collisionWorld);
 
         int endIslandIndex=1;