Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.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/btSphereTriangleCollisionAlgorithm.cpp (modified) (2 diffs)

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

@@ -23 +23 @@
 
 btSphereTriangleCollisionAlgorithm::btSphereTriangleCollisionAlgorithm(btPersistentManifold* mf,const btCollisionAlgorithmConstructionInfo& ci,btCollisionObject* col0,btCollisionObject* col1,bool swapped)
-: btCollisionAlgorithm(ci),
+: btActivatingCollisionAlgorithm(ci,col0,col1),
 m_ownManifold(false),
 m_manifoldPtr(mf),
@@ -57 +57 @@
         /// report a contact. internally this will be kept persistent, and contact reduction is done
         resultOut->setPersistentManifold(m_manifoldPtr);
-        SphereTriangleDetector detector(sphere,triangle);
+        SphereTriangleDetector detector(sphere,triangle, m_manifoldPtr->getContactBreakingThreshold());
         
         btDiscreteCollisionDetectorInterface::ClosestPointInput input;
-        input.m_maximumDistanceSquared = btScalar(1e30);//todo: tighter bounds
+        input.m_maximumDistanceSquared = btScalar(1e30);///@todo: tighter bounds
         input.m_transformA = sphereObj->getWorldTransform();
         input.m_transformB = triObj->getWorldTransform();