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 namespace vcg { - namespace trimesh { + namespace tri { //**MARKER CLASSES**// template @@ -247,7 +247,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; VDistFunct fn; _minDist=_maxDist; Point3x _closestPt; @@ -263,7 +263,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointNormalDistanceFunctor VDistFunct; + typedef vcg::vert::PointNormalDistanceFunctor VDistFunct; VDistFunct fn; _minDist=_maxDist; Point3x _closestPt; @@ -291,7 +291,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; VDistFunct distFunct; return (gr.GetKClosest/* */ (distFunct,mv,_k,_p,_maxDist,_objectPtrs,_distances,_points)); @@ -326,7 +326,7 @@ namespace vcg { typedef VertTmark MarkerVert; MarkerVert mv; mv.SetMesh(&mesh); - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; VDistFunct fn; return (gr.GetInSphere/**/ (fn, mv,_p,_r,_objectPtrs,_distances,_points)); @@ -424,13 +424,13 @@ namespace vcg { }; template - class ClosestVertexIterator:public vcg::ClosestIterator, VertTmark > + class ClosestVertexIterator:public vcg::ClosestIterator, VertTmark > { public: typedef GRID GridType; typedef MESH MeshType; typedef VertTmark MarkerVert; - typedef vcg::vertex::PointDistanceFunctor VDistFunct; + typedef vcg::vert::PointDistanceFunctor VDistFunct; typedef vcg::ClosestIterator > 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