From b96b375d64821b4ea13cbd4a459495ee86d435c1 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Tue, 30 Sep 2008 10:57:42 +0000 Subject: [PATCH] [Namespaces changes] vert->vrt 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/vertexmesh/closest.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vcg/complex/vertexmesh/closest.h b/vcg/complex/vertexmesh/closest.h index d03f26cb..e78d474e 100644 --- a/vcg/complex/vertexmesh/closest.h +++ b/vcg/complex/vertexmesh/closest.h @@ -36,7 +36,7 @@ #include namespace vcg { - namespace vertex { + namespace vrt { //**MARKER CLASSES**// template @@ -97,7 +97,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; return (gr.GetKClosest/**/ (VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points)); } @@ -114,7 +114,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; return (gr.GetInSphere/**/ (VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points)); } @@ -136,13 +136,13 @@ namespace vcg { //**ITERATORS DEFINITION**// template - class ClosestVertexIterator:public vcg::ClosestIterator > + class ClosestVertexIterator:public vcg::ClosestIterator > { public: typedef GRID GridType; typedef MESH MeshType; typedef VertTmark MarkerVert; - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; typedef vcg::ClosestIterator > ClosestBaseType; ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){} @@ -152,7 +152,7 @@ namespace vcg { }; - } // end namespace vertex + } // end namespace vert } // end namespace vcg #endif