From cec96ba2602d9657fc62ef54f0d2ac34daeb5f44 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Tue, 30 Sep 2008 10:48:41 +0000
Subject: [PATCH] addded template parameter to comply the new definition of
 functor and

[Namespaces changes]
vert->vertex

clean up of some namespaces to comply the following naming:

Complexes (3 letters namespaces):
order 0 (point cloud    ) :vrt
order 1 (edge meshes)     :edg
order 2 (triangle meshes) :tri
order 3 (triangle meshes) :tet

Simplexes (extended namespaces):
order 0 (vertex)      :vertex
order 1 (edge)        :edge
order 2 (triangle)    :triangle (temporarily it remains "face")
order 3 (tetrahedron) :tetrahedron
---
 vcg/complex/edgemesh/closest.h | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/vcg/complex/edgemesh/closest.h b/vcg/complex/edgemesh/closest.h
index bdbb7f72..2866abbf 100644
--- a/vcg/complex/edgemesh/closest.h
+++ b/vcg/complex/edgemesh/closest.h
@@ -76,7 +76,7 @@ namespace vcg {
 			typedef EdgeTmark<MESH> MarkerEdge;
 			MarkerEdge mf;
 			mf.SetMesh(&mesh);
-			vcg::edge::PointDistanceFunctor PDistFunct;
+			vcg::edge::PointDistanceFunctor<ScalarType> PDistFunct;
 			_minDist=_maxDist;
 			return (gr.GetClosest(PDistFunct,mf,_p,_maxDist,_minDist,_closestPt));
 		}
@@ -90,7 +90,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<ScalarType> VDistFunct;
 			_minDist=_maxDist;
 			Point3x _closestPt;
 			return (gr.GetClosest/*<VDistFunct,MarkerVert>*/(VDistFunct(),mv,_p,_maxDist,_minDist,_closestPt));
@@ -101,10 +101,11 @@ namespace vcg {
 			const typename GRID::CoordType & _p, const typename GRID::ScalarType & _maxDist,
 			OBJPTRCONTAINER & _objectPtrs,DISTCONTAINER & _distances, POINTCONTAINER & _points)
 		{
+			typedef typename GRID::ScalarType ScalarType;
 			typedef EdgeTmark<MESH> MarkerEdge;
 			MarkerEdge mf;
 			mf.SetMesh(&mesh);
-		  vcg::face::PointDistanceFunctor FDistFunct;
+		  vcg::face::PointDistanceFunctor<ScalarType> FDistFunct;
 			return (gr.GetKClosest /*<vcg::face::PointDistanceFunctor, MarkerFace,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(FDistFunct,mf,_k,_p,_maxDist,_objectPtrs,_distances,_points));
 		}
@@ -114,10 +115,11 @@ namespace vcg {
 			const typename GRID::CoordType & _p, const typename GRID::ScalarType & _maxDist,
 			OBJPTRCONTAINER & _objectPtrs,DISTCONTAINER & _distances, POINTCONTAINER & _points)
 		{
+			typedef typename GRID::ScalarType ScalarType;
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<ScalarType> VDistFunct;
 			return (gr.GetKClosest/* <VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
 		}
@@ -132,10 +134,11 @@ namespace vcg {
 			DISTCONTAINER & _distances, 
 			POINTCONTAINER & _points)
 		{
+			typedef typename GRID::ScalarType ScalarType;
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<ScalarType> VDistFunct;
 			return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points));
 		}