diff --git a/src/narrowphase/narrowphase.cpp b/src/narrowphase/narrowphase.cpp index 0fb235b9988492064a466c95bbedd7ae3d2b07cd..0651ec11d4b5eea97ea656ba794ef23e79dd85ef 100644 --- a/src/narrowphase/narrowphase.cpp +++ b/src/narrowphase/narrowphase.cpp @@ -46,7 +46,7 @@ namespace fcl namespace details { - +#if 0 // Clamp n to lie within the range [min, max] float clamp(float n, float min, float max) { if (n < min) return min; @@ -170,7 +170,7 @@ namespace details return true; } - +#endif // Compute the point on a line segment that is the closest point on the @@ -2929,7 +2929,7 @@ bool GJKSolver_libccd::shapeDistance<Capsule, Capsule>(const Capsule& s1, const const Capsule& s2, const Transform3f& tf2, FCL_REAL* dist, Vec3f* p1, Vec3f* p2) const { - return details::capsuleCapsuleDistance(s1, tf1, s2, tf2, dist, p1, p2); + abort (); } @@ -3313,7 +3313,7 @@ bool GJKSolver_indep::shapeDistance<Capsule, Capsule>(const Capsule& s1, const T const Capsule& s2, const Transform3f& tf2, FCL_REAL* dist, Vec3f* p1, Vec3f* p2) const { - return details::capsuleCapsuleDistance(s1, tf1, s2, tf2, dist, p1, p2); + abort (); }