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