From 9143a0d3898d71ba3d58669aee955925285a6862 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Tue, 30 Sep 2008 10:49:09 +0000 Subject: [PATCH] [Namespaces changes] edge->edg 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/edgemesh/unify.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcg/complex/edgemesh/unify.h b/vcg/complex/edgemesh/unify.h index 88b0c16e..3a11f6a2 100644 --- a/vcg/complex/edgemesh/unify.h +++ b/vcg/complex/edgemesh/unify.h @@ -140,7 +140,7 @@ namespace vcg bool lastRound ; if(em.vn){ - vcg::edge::UpdateBounding::Box(em); + vcg::edg::UpdateBounding::Box(em); //Grid().SetBBox(em.bbox); std::vector pv; @@ -162,7 +162,7 @@ namespace vcg (*pvi).v->SetD(); ScalarType max_dist=em.bbox.Diag(); ScalarType min_dist = 0; - p = (vcg::trimesh::GetClosestVertex( em, Grid(), vpos, + p = (vcg::tri::GetClosestVertex( em, Grid(), vpos, max_dist, min_dist))->P(); //closest = Grid().GetClosest(vpos, max_dist, BackCompDist(), eps, p,tm);