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

Modified check for diagonal collapses

This commit is contained in:
Paolo Cignoni 2011-02-04 17:14:47 +00:00
parent cc5645ca46
commit 4107c587d0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vcg/complex/trimesh/update/halfedge_topology.h
View File

@ -1221,32 +1221,32 @@ namespace vcg
// Second check // Second check
sort (faces1.begin(), faces1.end()); set<VertexPointer> set1;
sort (faces2.begin(), faces2.end()); set<VertexPointer> set2;
if( faces1[0] == NULL ) vector<VertexPointer> vect1 = getVertices(hp->HVp());
faces1.erase(faces1.begin()); vector<VertexPointer> vect2 = getVertices(hp->HNp()->HNp()->HVp());
if( faces2[0] == NULL ) set1.insert(vect1.begin(), vect1.end());
faces2.erase(faces2.begin()); set2.insert(vect2.begin(), vect2.end());
vector<FacePointer> intersection(faces1.size()+faces2.size()); size = vect1.size();
typename vector<FacePointer>::iterator it; if(vect2.size() < size)
size = vect2.size();
it = set_intersection(faces1.begin(),faces1.end(), faces2.begin(), faces2.end(), intersection.begin()); vector<VertexPointer> intersection(size);
intersection.erase(it,intersection.end()); typename vector<VertexPointer>::iterator it;
it = set_intersection(set1.begin(), set1.end(), set2.begin(), set2.end(), intersection.begin());
size = intersection.size(); size = it- intersection.begin();
assert( size != 0); assert( size >= 2 );
if(size != 1) return (size==2);
return false;
// End of second check // End of second check
return true;
} }
/*! /*!