From e90c417d2b56915e17d3b2f1cee5f794bd9cbd35 Mon Sep 17 00:00:00 2001
From: gianpaolopalma <gianpaolo.palma@isti.cnr.it>
Date: Mon, 21 Mar 2011 17:02:02 +0000
Subject: [PATCH] Minor changes in ClosestPoint function

---
 vcg/space/segment2.h | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/vcg/space/segment2.h b/vcg/space/segment2.h
index c16c7f61..21305ab5 100644
--- a/vcg/space/segment2.h
+++ b/vcg/space/segment2.h
@@ -148,26 +148,16 @@ Point2<ScalarType> ClosestPoint( Segment2<ScalarType> s, const Point2<ScalarType
 {
 	vcg::Line2<ScalarType> l;
 	l.Set(s.P0(),s.P1()-s.P0());
-	l.Normalize();
-	Point2<ScalarType> clos=vcg::ClosestPoint<ScalarType,true>(l,p) ;//attention to call
-	vcg::Box2<ScalarType> b;
-	b.Add(s.P0());
-	b.Add(s.P1());
-	if (b.IsIn(clos))
-		return clos;
+	l = l.Normalize();
+	ScalarType t = l.Projection(p);
+	Point2<ScalarType> clos = l.P(t);
+	int lenght = s.Length();
+	if (t <= 0)
+		return s.P0();
+	else if (t >= lenght)
+		return s.P1();
 	else
-	{
-		ScalarType d0=(s.P0()-p).Norm();
-		ScalarType d1=(s.P1()-p).Norm();
-		if (d0<d1)
-			return (s.P0());
-		else
-			return (s.P1());
-	}
-	/*ScalarType t = s.Projection(p); 
-	if (s<0) return s.P0();
-	if (s>1) return s.P0();
-	return s.P(t);*/ 
+		return clos;
 }
 
 /*@}*/