From ae3255f5e974fd8c4e82a807582e9aad970a6c8b Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Wed, 12 Aug 2009 01:17:12 +0000 Subject: [PATCH] initialize maximum distance to zero when not using separating distance utility. --- .../SpuGatheringCollisionTask.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp index 4fed4c408..4c90b983d 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuGatheringCollisionTask.cpp @@ -1067,7 +1067,11 @@ void processCollisionTask(void* userPtr, void* lsMemPtr) BoxPoint resultClosestBoxPointA; BoxPoint resultClosestBoxPointB; Vector3 resultNormal; - float distanceThreshold = FLT_MAX;//0.0f;//FLT_MAX;//use epsilon? +#ifdef USE_SEPDISTANCE_UTIL + float distanceThreshold = FLT_MAX +#else + float distanceThreshold = 0.f; +#endif distance = boxBoxDistance(resultNormal,resultClosestBoxPointA,resultClosestBoxPointB, boxA, transformA, boxB,transformB,distanceThreshold);