Cleaned up and added option on the size of the holes to be closed

This commit is contained in:
Paolo Cignoni 2006-12-01 21:25:23 +00:00
parent 02456f0505
commit 14dc0c2a0f
1 changed files with 14 additions and 23 deletions

View File

@ -36,18 +36,18 @@ class MyMesh : public tri::TriMesh< vector<MyVertex>, vector<MyFace > >{};
bool callback(int percent, const char *str) { bool callback(int percent, const char *str) {
cout << "str: " << str << " " << percent << "%\n"; cout << "str: " << str << " " << percent << "%\r";
return true; return true;
} }
int main(int argc,char ** argv){ int main(int argc,char ** argv){
if(argc<4) if(argc<5)
{ {
printf( printf(
"\n HoleFilling ("__DATE__")\n" "\n HoleFilling ("__DATE__")\n"
"Visual Computing Group I.S.T.I. C.N.R.\n" "Visual Computing Group I.S.T.I. C.N.R.\n"
"Usage: trimesh_hole #algorithm filein.ply fileout.ply \n" "Usage: trimesh_hole #algorithm #size filein.ply fileout.ply \n"
"#algorithm: \n" "#algorithm: \n"
" 1) Trivial Ear \n" " 1) Trivial Ear \n"
" 2) Leipa Ear \n" " 2) Leipa Ear \n"
@ -58,6 +58,7 @@ int main(int argc,char ** argv){
} }
int algorithm = atoi(argv[1]); int algorithm = atoi(argv[1]);
int holeSize = atoi(argv[2]);
if(algorithm < 0 && algorithm > 4) if(algorithm < 0 && algorithm > 4)
{ {
printf("Error in algorithm's selection\n",algorithm); printf("Error in algorithm's selection\n",algorithm);
@ -66,7 +67,7 @@ int main(int argc,char ** argv){
MyMesh m; MyMesh m;
if(tri::io::ImporterPLY<MyMesh>::Open(m,argv[2])!=0) if(tri::io::ImporterPLY<MyMesh>::Open(m,argv[3])!=0)
{ {
printf("Error reading file %s\n",argv[2]); printf("Error reading file %s\n",argv[2]);
exit(0); exit(0);
@ -77,29 +78,19 @@ int main(int argc,char ** argv){
tri::UpdateTopology<MyMesh>::FaceFace(m); tri::UpdateTopology<MyMesh>::FaceFace(m);
tri::UpdateNormals<MyMesh>::PerVertex(m); tri::UpdateNormals<MyMesh>::PerVertex(m);
tri::UpdateFlags<MyMesh>::FaceBorderFromFF(m); tri::UpdateFlags<MyMesh>::FaceBorderFromFF(m);
assert(tri::Clean<MyMesh>::IsFFAdjacencyConsistent(m));
vcg::tri::Hole<MyMesh> holeFiller; tri::Hole<MyMesh> holeFiller;
switch(algorithm) switch(algorithm)
{ {
case 1: case 1: tri::Hole<MyMesh>::EarCuttingFill<tri::TrivialEar<MyMesh> >(m,holeSize,false); break;
case 2: tri::Hole<MyMesh>::EarCuttingFill<tri::MinimumWeightEar< MyMesh> >(m,holeSize,false,callback); break;
holeFiller.EarCuttingFill<vcg::tri::TrivialEar<MyMesh> >(m,50,false); case 3: tri::Hole<MyMesh>::EarCuttingIntersectionFill<tri::SelfIntersectionEar< MyMesh> >(m,holeSize,false); break;
break; case 4: tri::Hole<MyMesh>::MinimumWeightFill(m, false); break;
case 2:
assert(tri::Clean<MyMesh>::IsFFAdjacencyConsistent(m));
holeFiller.EarCuttingFill<vcg::tri::MinimumWeightEar< MyMesh> >(m,10,false,callback);
assert(tri::Clean<MyMesh>::IsFFAdjacencyConsistent(m));
break;
case 3:
holeFiller.EarCuttingIntersectionFill<vcg::tri::SelfIntersectionEar< MyMesh> >(m,500,false);
break;
case 4:
holeFiller.MinimumWeightFill(m, false);
break;
} }
printf("\nCompleted. Saving....\n");
tri::io::ExporterPLY<MyMesh>::Save(m,argv[3],false); assert(tri::Clean<MyMesh>::IsFFAdjacencyConsistent(m));
tri::io::ExporterPLY<MyMesh>::Save(m,argv[4],false);
return 0; return 0;
} }