From 3cb29c805b36e6b53521966fb01e13c8ead6db84 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Tue, 19 Aug 2008 10:21:01 +0000 Subject: [PATCH] changed template from vcg::Triangle to generic class to allow to pass a vcg::FaceSimpX (recall: the disambiguation was done in the function name exactly for this reason) --- vcg/space/intersection3.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vcg/space/intersection3.h b/vcg/space/intersection3.h index 2cac0ead..0923a727 100644 --- a/vcg/space/intersection3.h +++ b/vcg/space/intersection3.h @@ -249,15 +249,15 @@ namespace vcg { * while in the second item is stored the penetration depth * \return true iff there is an intersection between the sphere and the triangle */ - template < class SCALAR_TYPE > + template < class SCALAR_TYPE, class TRIANGLETYPE > bool IntersectionSphereTriangle(const vcg::Sphere3 < SCALAR_TYPE > & sphere , - const vcg::Triangle3< SCALAR_TYPE > & triangle, + TRIANGLETYPE triangle, vcg::Point3 < SCALAR_TYPE > & witness , std::pair< SCALAR_TYPE, SCALAR_TYPE > * res=NULL) { typedef SCALAR_TYPE ScalarType; typedef typename vcg::Point3< ScalarType > Point3t; - typedef typename vcg::Triangle3< ScalarType > Triangle3t; + typedef typename TRIANGLETYPE Triangle3t; bool penetration_detected = false;