From 33d860cbb9f3667c782e4a3b8eaf3bf05b8f14ab Mon Sep 17 00:00:00 2001 From: cnr-isti-vclab Date: Wed, 31 Jan 2007 11:46:12 +0000 Subject: [PATCH] Bug fix --- apps/sample/trimesh_hole/trimesh_hole.cpp | 2 +- vcg/complex/trimesh/hole.h | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/apps/sample/trimesh_hole/trimesh_hole.cpp b/apps/sample/trimesh_hole/trimesh_hole.cpp index a7cc9fc0..7de1e3bf 100644 --- a/apps/sample/trimesh_hole/trimesh_hole.cpp +++ b/apps/sample/trimesh_hole/trimesh_hole.cpp @@ -70,7 +70,7 @@ int main(int argc,char ** argv){ "Usage: trimesh_hole #algorithm #size filein.ply fileout.ply \n" "#algorithm: \n" " 1) Trivial Ear \n" - " 2) Leipa Ear \n" + " 2) Minimum weight Ear \n" " 3) Selfintersection Ear \n" " 4) Minimum weight \n" ); diff --git a/vcg/complex/trimesh/hole.h b/vcg/complex/trimesh/hole.h index 460ab5ed..0cac93ab 100644 --- a/vcg/complex/trimesh/hole.h +++ b/vcg/complex/trimesh/hole.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.32 2007/01/18 18:15:14 cignoni +added missing typenames + Revision 1.31 2007/01/18 11:17:43 giec The minimum weight algorithm keep the topology consistent. @@ -872,10 +875,17 @@ template PosType PF = vv[i]; triangulate(m,f, i, j, vi, vv,PF); + + while(f!=m.face.end()) + { + (*f).SetD(); + ++f; + m.fn--; + } } - static void triangulate(MESH &m, FaceIterator f,int i, int j, + static void triangulate(MESH &m, FaceIterator &f,int i, int j, std::vector< std::vector > vi, std::vector vv, PosType &PosFrom) { if(i + 1 == j){return;} @@ -995,12 +1005,6 @@ template } };//close class Hole - - - - - - } // end namespace }