From ac3321980cdf00a9760ba86f328f0416bf311e05 Mon Sep 17 00:00:00 2001
From: ganovelli <fabio.ganovelli@isti.cnr.it>
Date: Tue, 30 Sep 2008 10:52:09 +0000
Subject: [PATCH] [Namespaces changes] vert->vertex trimesh->tri

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/trimesh/closest.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/vcg/complex/trimesh/closest.h b/vcg/complex/trimesh/closest.h
index c6df19a0..2bde5080 100644
--- a/vcg/complex/trimesh/closest.h
+++ b/vcg/complex/trimesh/closest.h
@@ -137,7 +137,7 @@ header added
 #include <vcg/space/index/space_iterators.h>
 
 namespace vcg {
-	namespace trimesh {
+	namespace tri {
 
 		//**MARKER CLASSES**//
 		template <class MESH_TYPE,class OBJ_TYPE>
@@ -247,7 +247,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct fn;
 			_minDist=_maxDist;
 			Point3x _closestPt;
@@ -263,7 +263,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointNormalDistanceFunctor<typename MESH::VertexType> VDistFunct;
+			typedef vcg::vert::PointNormalDistanceFunctor<typename MESH::VertexType> VDistFunct;
 			VDistFunct fn;
 			_minDist=_maxDist;
 			Point3x _closestPt;
@@ -291,7 +291,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);			
-			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct distFunct;
 			return (gr.GetKClosest/* <VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(distFunct,mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
@@ -326,7 +326,7 @@ namespace vcg {
 			typedef VertTmark<MESH> MarkerVert;
 			MarkerVert mv;
 			mv.SetMesh(&mesh);
-			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			VDistFunct fn;
 			return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
 				(fn, mv,_p,_r,_objectPtrs,_distances,_points));
@@ -424,13 +424,13 @@ namespace vcg {
 		};
 
 		template <class GRID,class MESH>
-		class ClosestVertexIterator:public vcg::ClosestIterator<GRID, vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType>, VertTmark<MESH> >
+		class ClosestVertexIterator:public vcg::ClosestIterator<GRID, vcg::vert::PointDistanceFunctor<typename MESH::ScalarType>, VertTmark<MESH> >
 		{
 		public:
 			typedef GRID GridType;
 			typedef MESH MeshType;
 			typedef VertTmark<MESH> MarkerVert;
-			typedef vcg::vertex::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
+			typedef vcg::vert::PointDistanceFunctor<typename MESH::ScalarType> VDistFunct;
 			typedef vcg::ClosestIterator<GRID, VDistFunct, VertTmark<MESH> > ClosestBaseType;
             VDistFunct fn;
 			ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,fn){}
@@ -460,7 +460,7 @@ namespace vcg {
 
 		};
 
-	}	 // end namespace trimesh
+	}	 // end namespace tri
 }	 // end namespace vcg
 
 #endif