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

Corrected a small bug in CountNonManifoldVertexFFVF and changed the use of bit from selection to visit bit in the CountEdges

This commit is contained in:
Paolo Cignoni 2010-01-03 01:59:32 +00:00
parent 49bbc55cac
commit 29e956d524
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vcg/complex/trimesh/clean.h
View File

@ -948,6 +948,9 @@ private:
if (!vi->IsD()) if (!vi->IsD())
{ {
face::VFIterator<FaceType> vfi(&*vi); face::VFIterator<FaceType> vfi(&*vi);
if(vfi.End()) // if the vertex has no incident face (e.g. the iterator is at the end)
continue;
face::Pos<FaceType> pos((*vi).VFp(), &*vi); face::Pos<FaceType> pos((*vi).VFp(), &*vi);
starSizeFF = pos.NumberOfIncidentFaces(); starSizeFF = pos.NumberOfIncidentFaces();
@ -982,6 +985,7 @@ private:
static void CountEdges( MeshType & m, int &count_e, int &boundary_e ) static void CountEdges( MeshType & m, int &count_e, int &boundary_e )
{ {
UpdateFlags<MeshType>::FaceClearV(m);
FaceIterator fi; FaceIterator fi;
vcg::face::Pos<FaceType> he; vcg::face::Pos<FaceType> he;
vcg::face::Pos<FaceType> hei; vcg::face::Pos<FaceType> hei;
@ -990,7 +994,7 @@ private:
{ {
if(!((*fi).IsD())) if(!((*fi).IsD()))
{ {
(*fi).SetS(); (*fi).SetV();
count_e +=3; //assume that we have to increase the number of edges with three count_e +=3; //assume that we have to increase the number of edges with three
for(int j=0; j<3; j++) for(int j=0; j<3; j++)
{ {
@ -998,7 +1002,7 @@ private:
boundary_e++; // then increase the number of boundary edges boundary_e++; // then increase the number of boundary edges
else if (IsManifold(*fi,j))//If this edge is manifold else if (IsManifold(*fi,j))//If this edge is manifold
{ {
if((*fi).FFp(j)->IsS()) //If the face on the other side of the edge is already selected if((*fi).FFp(j)->IsV()) //If the face on the other side of the edge is already selected
count_e--; // we counted one edge twice count_e--; // we counted one edge twice
} }
else//We have a non-manifold edge else//We have a non-manifold edge
@ -1008,7 +1012,7 @@ private:
he.NextF(); he.NextF();
while (he.f!=hei.f)// so we have to iterate all faces that are connected to this edge while (he.f!=hei.f)// so we have to iterate all faces that are connected to this edge
{ {
if (he.f->IsS())// if one of the other faces was already visited than this edge was counted already. if (he.f->IsV())// if one of the other faces was already visited than this edge was counted already.
{ {
counted=true; counted=true;
break; break;