From ece2df9202901cf16faa876bd8ee4ec564645398 Mon Sep 17 00:00:00 2001 From: ganovelli Date: Tue, 30 Sep 2008 10:53:28 +0000 Subject: [PATCH] [Namespaces changes] 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/trimesh/create/ball_pivoting.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vcg/complex/trimesh/create/ball_pivoting.h b/vcg/complex/trimesh/create/ball_pivoting.h index 01a41b9e..c0ca9765 100644 --- a/vcg/complex/trimesh/create/ball_pivoting.h +++ b/vcg/complex/trimesh/create/ball_pivoting.h @@ -79,7 +79,7 @@ template class BallPivoting: public AdvancingFront { if(f.IsD()) continue; for(int k = 0; k < 3; k++) { f.V(k)->SetV(); - int n = trimesh::GetInSphereVertex(this->mesh, grid, f.V(k)->P(), min_edge, targets, dists, points); + int n = tri::GetInSphereVertex(this->mesh, grid, f.V(k)->P(), min_edge, targets, dists, points); for(int t = 0; t < n; t++) { targets[t]->SetUserBit(usedBit); assert(targets[t]->IsUserBit(usedBit)); @@ -105,7 +105,7 @@ template class BallPivoting: public AdvancingFront { seed.SetUserBit(usedBit); - int n = trimesh::GetInSphereVertex(this->mesh, grid, seed.P(), 2*radius, targets, dists, points); + int n = tri::GetInSphereVertex(this->mesh, grid, seed.P(), 2*radius, targets, dists, points); if(n < 3) { continue; } @@ -235,7 +235,7 @@ template class BallPivoting: public AdvancingFront { std::vector dists; std::vector points; - int n = trimesh::GetInSphereVertex(this->mesh, grid, middle, r + radius, targets, dists, points); + int n = tri::GetInSphereVertex(this->mesh, grid, middle, r + radius, targets, dists, points); if(targets.size() == 0) { return -1; //this really would be strange but one never knows. @@ -395,7 +395,7 @@ template class BallPivoting: public AdvancingFront { std::vector targets; std::vector points; std::vector dists; - int n = trimesh::GetInSphereVertex(this->mesh, grid, v->P(), min_edge, targets, dists, points); + int n = tri::GetInSphereVertex(this->mesh, grid, v->P(), min_edge, targets, dists, points); for(int t = 0; t < n; t++) targets[t]->SetUserBit(usedBit); v->SetV();