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

Completed and tested self-intersection routine

This commit is contained in:
Paolo Cignoni 2005-11-22 14:04:10 +00:00
parent 7d8f6cfd5c
commit 88662e6045
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.12 2005/11/17 00:41:07 cignoni
Removed Initialize use updateflags::Clear() instead.
Revision 1.11 2005/11/16 16:33:23 rita_borgo Revision 1.11 2005/11/16 16:33:23 rita_borgo
Changed ComputeSelfintersection Changed ComputeSelfintersection
@ -71,6 +74,7 @@ Initial Release
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include <vcg/simplex/face/face.h> #include <vcg/simplex/face/face.h>
#include<vcg/simplex/face/topology.h> #include<vcg/simplex/face/topology.h>
#include <vcg/complex/trimesh/base.h> #include <vcg/complex/trimesh/base.h>
@ -641,16 +645,22 @@ The polyhedral formula corresponds to the special case g==0.
std::vector<FaceType*> inBox; std::vector<FaceType*> inBox;
gM.Set<vector<FaceType>::iterator>(m.face.begin(),m.face.end()); gM.Set<vector<FaceType>::iterator>(m.face.begin(),m.face.end());
for(fi=m.face.begin();fi!=m.face.end();++fi) for(fi=m.face.begin();fi!=m.face.end();++fi)
{ {
// for(int i =0; i<3; i++)
// bbox.Add((*fi).V(i)->P()); (*fi).GetBBox(bbox);
nelem = vcg::trimesh::GetInBoxFace(m, gM, bbox,inBox); vcg::trimesh::GetInBoxFace(m, gM, bbox,inBox);
// fill the cell // fill the cell
/*....*/ /*....*/
nelem = inBox.size(); nelem = inBox.size();
if (nelem>=2)// in a cell if (nelem>=2)// in a cell
{ {
//test combinations of elements //test combinations of elements
@ -658,12 +668,15 @@ The polyhedral formula corresponds to the special case g==0.
for (int j=i+1;j<nelem;j++) for (int j=i+1;j<nelem;j++)
if ((!inBox[i]->IsD())&&(!inBox[j]->IsD())&&(TestIntersection(inBox[i],inBox[j]))) if ((!inBox[i]->IsD())&&(!inBox[j]->IsD())&&(TestIntersection(inBox[i],inBox[j])))
{ {
ret.push_back(inBox[i]); ret.push_back(inBox[i]);
ret.push_back(inBox[j]); ret.push_back(inBox[j]);
} }
} }
inBox.clear();
bbox.SetNull();
} }
return false; return (ret.size()>0);
} }
@ -672,8 +685,8 @@ static bool TestIntersection(FaceType *f0,FaceType *f1)
{ {
assert((!f0->IsD())&&(!f1->IsD())); assert((!f0->IsD())&&(!f1->IsD()));
//no adiacent faces //no adiacent faces
if ((f0!=f1)&& (!ShareEdge(f0,f1)) if ( (f0!=f1) && (!ShareEdge(f0,f1))
&& (!ShareVertex(f0,f1))) && (!ShareVertex(f0,f1)) )
return (vcg::Intersection<FaceType>((*f0),(*f1))); return (vcg::Intersection<FaceType>((*f0),(*f1)));
return false; return false;
} }