Changeset 2907 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

Timestamp:

Apr 8, 2009, 12:36:08 AM (16 years ago)

Author:

dafrick

Message:

Merging of the current QuestSystem branch.

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp (modified) (7 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionDispatch/btCollisionWorld.cpp

@@ -70 +70 @@
                         getBroadphase()->getOverlappingPairCache()->cleanProxyFromPairs(bp,m_dispatcher1);
                         getBroadphase()->destroyProxy(bp,m_dispatcher1);
+                        collisionObject->setBroadphaseHandle(0);
                 }
         }
@@ -119 +120 @@
 
 
+void    btCollisionWorld::updateSingleAabb(btCollisionObject* colObj)
+{
+        btVector3 minAabb,maxAabb;
+        colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
+        //need to increase the aabb for contact thresholds
+        btVector3 contactThreshold(gContactBreakingThreshold,gContactBreakingThreshold,gContactBreakingThreshold);
+        minAabb -= contactThreshold;
+        maxAabb += contactThreshold;
+
+        btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
+
+        //moving objects should be moderately sized, probably something wrong if not
+        if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
+        {
+                bp->setAabb(colObj->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
+        } else
+        {
+                //something went wrong, investigate
+                //this assert is unwanted in 3D modelers (danger of loosing work)
+                colObj->setActivationState(DISABLE_SIMULATION);
+
+                static bool reportMe = true;
+                if (reportMe && m_debugDrawer)
+                {
+                        reportMe = false;
+                        m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
+                        m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
+                        m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
+                        m_debugDrawer->reportErrorWarning("Thanks.\n");
+                }
+        }
+}
+
 void    btCollisionWorld::updateAabbs()
 {
@@ -131 +165 @@
                 if (colObj->isActive())
                 {
-                        btVector3 minAabb,maxAabb;
-                        colObj->getCollisionShape()->getAabb(colObj->getWorldTransform(), minAabb,maxAabb);
-                        //need to increase the aabb for contact thresholds
-                        btVector3 contactThreshold(gContactBreakingThreshold,gContactBreakingThreshold,gContactBreakingThreshold);
-                        minAabb -= contactThreshold;
-                        maxAabb += contactThreshold;
-
-                        btBroadphaseInterface* bp = (btBroadphaseInterface*)m_broadphasePairCache;
-
-                        //moving objects should be moderately sized, probably something wrong if not
-                        if ( colObj->isStaticObject() || ((maxAabb-minAabb).length2() < btScalar(1e12)))
-                        {
-                                bp->setAabb(colObj->getBroadphaseHandle(),minAabb,maxAabb, m_dispatcher1);
-                        } else
-                        {
-                                //something went wrong, investigate
-                                //this assert is unwanted in 3D modelers (danger of loosing work)
-                                colObj->setActivationState(DISABLE_SIMULATION);
-
-                                static bool reportMe = true;
-                                if (reportMe && m_debugDrawer)
-                                {
-                                        reportMe = false;
-                                        m_debugDrawer->reportErrorWarning("Overflow in AABB, object removed from simulation");
-                                        m_debugDrawer->reportErrorWarning("If you can reproduce this, please email bugs@continuousphysics.com\n");
-                                        m_debugDrawer->reportErrorWarning("Please include above information, your Platform, version of OS.\n");
-                                        m_debugDrawer->reportErrorWarning("Thanks.\n");
-                                }
-                        }
-                }
-        }
-
+                        updateSingleAabb(colObj);
+                }
+        }
 }
 
@@ -294 +299 @@
                                         BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
                                                 btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape*    triangleMesh):
-                                                btTriangleRaycastCallback(from,to),
+                  //@BP Mod
+                                                btTriangleRaycastCallback(from,to, resultCallback->m_flags),
                                                         m_resultCallback(resultCallback),
                                                         m_collisionObject(collisionObject),
@@ -343 +349 @@
                                         BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
                                                 btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btConcaveShape* triangleMesh):
-                                                btTriangleRaycastCallback(from,to),
+                  //@BP Mod
+                  btTriangleRaycastCallback(from,to, resultCallback->m_flags),
                                                         m_resultCallback(resultCallback),
                                                         m_collisionObject(collisionObject),
@@ -664 +671 @@
                         //RigidcollisionObject* collisionObject = ctrl->GetRigidcollisionObject();
                         //btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
-                        
+#if 0
 #ifdef RECALCULATE_AABB
                         btVector3 collisionObjectAabbMin,collisionObjectAabbMax;
@@ -672 +679 @@
                         const btVector3& collisionObjectAabbMin = collisionObject->getBroadphaseHandle()->m_aabbMin;
                         const btVector3& collisionObjectAabbMax = collisionObject->getBroadphaseHandle()->m_aabbMax;
+#endif
 #endif
                         //btScalar hitLambda = m_resultCallback.m_closestHitFraction;