Changeset 2430 for code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h

Timestamp:

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

Author:

rgrieder

Message:

Updated to Bullet 2.73 (first part).

File:

• code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h (modified) (4 diffs)

code/branches/physics/src/bullet/BulletCollision/CollisionDispatch/SphereTriangleDetector.h

@@ -18 +18 @@
 
 #include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
-#include "LinearMath/btPoint3.h"
+
 
 
@@ -31 +31 @@
         virtual void    getClosestPoints(const ClosestPointInput& input,Result& output,class btIDebugDraw* debugDraw,bool swapResults=false);
 
-        SphereTriangleDetector(btSphereShape* sphere,btTriangleShape* triangle);
+        SphereTriangleDetector(btSphereShape* sphere,btTriangleShape* triangle, btScalar contactBreakingThreshold);
 
         virtual ~SphereTriangleDetector() {};
@@ -37 +37 @@
 private:
 
-        bool collide(const btVector3& sphereCenter,btVector3 &point, btVector3& resultNormal, btScalar& depth, btScalar &timeOfImpact);
+        bool collide(const btVector3& sphereCenter,btVector3 &point, btVector3& resultNormal, btScalar& depth, btScalar &timeOfImpact, btScalar contactBreakingThreshold);
         bool pointInTriangle(const btVector3 vertices[], const btVector3 &normal, btVector3 *p );
         bool facecontains(const btVector3 &p,const btVector3* vertices,btVector3& normal);
@@ -43 +43 @@
         btSphereShape* m_sphere;
         btTriangleShape* m_triangle;
-
+        btScalar        m_contactBreakingThreshold;
         
 };