From e690807441bd43171abfbb30ab83dbb2b7842ebc Mon Sep 17 00:00:00 2001 From: nicopietroni Date: Fri, 15 Oct 2010 15:17:15 +0000 Subject: [PATCH] Distance functions moved to distance3.h --- vcg/space/sphere3.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/vcg/space/sphere3.h b/vcg/space/sphere3.h index 92aeff76..5cd2ab28 100644 --- a/vcg/space/sphere3.h +++ b/vcg/space/sphere3.h @@ -104,20 +104,20 @@ protected: T threshold = 1.01, T speed = 0.6); }; -template T Distance(const Sphere3 &sphere, - const Point3 &point) { - T dist = Distance(point, sphere.Center()) - sphere.Radius(); - if(dist < 0) dist = 0; - return dist; -} - -template T Distance(const Sphere3 &sphere, - const Sphere3 &s) { - T dist = Distance(s.Center(), sphere.Center()) - - sphere.Radius() - s.Radius(); - if(dist < 0) dist = 0; - return dist; -} +//template T Distance(const Sphere3 &sphere, +// const Point3 &point) { +// T dist = Distance(point, sphere.Center()) - sphere.Radius(); +// if(dist < 0) dist = 0; +// return dist; +//} +// +//template T Distance(const Sphere3 &sphere, +// const Sphere3 &s) { +// T dist = Distance(s.Center(), sphere.Center()) +// - sphere.Radius() - s.Radius(); +// if(dist < 0) dist = 0; +// return dist; +//} typedef Sphere3 Sphere3f; typedef Sphere3 Sphere3d;