manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[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
This commit is contained in:
ganovelli 2008-09-30 10:57:42 +00:00
parent beb57b487c
commit b96b375d64
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vcg/complex/vertexmesh/closest.h
View File

@ -36,7 +36,7 @@
#include <vcg/space/index/space_iterators.h> #include <vcg/space/index/space_iterators.h>
namespace vcg { namespace vcg {
namespace vertex { namespace vrt {
//**MARKER CLASSES**// //**MARKER CLASSES**//
template <class MESH_TYPE,class OBJ_TYPE> template <class MESH_TYPE,class OBJ_TYPE>
@ -97,7 +97,7 @@ namespace vcg {
typedef VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vert::PointDistanceFunctor VDistFunct;
return (gr.GetKClosest/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/ return (gr.GetKClosest/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
(VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points)); (VDistFunct(),mv,_k,_p,_maxDist,_objectPtrs,_distances,_points));
} }
@ -114,7 +114,7 @@ namespace vcg {
typedef VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
MarkerVert mv; MarkerVert mv;
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vert::PointDistanceFunctor VDistFunct;
return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/ return (gr.GetInSphere/*<VDistFunct,MarkerVert,OBJPTRCONTAINER,DISTCONTAINER,POINTCONTAINER>*/
(VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points)); (VDistFunct(),mv,_p,_r,_objectPtrs,_distances,_points));
} }
@ -136,13 +136,13 @@ namespace vcg {
//**ITERATORS DEFINITION**// //**ITERATORS DEFINITION**//
template <class GRID,class MESH> template <class GRID,class MESH>
class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vertex::PointDistanceFunctor, VertTmark<MESH> > class ClosestVertexIterator:public vcg::ClosestIterator<GRID,vcg::vert::PointDistanceFunctor, VertTmark<MESH> >
{ {
public: public:
typedef GRID GridType; typedef GRID GridType;
typedef MESH MeshType; typedef MESH MeshType;
typedef VertTmark<MESH> MarkerVert; typedef VertTmark<MESH> MarkerVert;
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vert::PointDistanceFunctor VDistFunct;
typedef vcg::ClosestIterator<GRID,VDistFunct, VertTmark<MESH> > ClosestBaseType; typedef vcg::ClosestIterator<GRID,VDistFunct, VertTmark<MESH> > ClosestBaseType;
ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){} ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){}
@ -152,7 +152,7 @@ namespace vcg {
}; };
} // end namespace vertex } // end namespace vert
} // end namespace vcg } // end namespace vcg
#endif #endif