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

Reverted to version 1.13. Version 1.14 was done on outdated version.

This commit is contained in:
Paolo Cignoni 2006-08-30 06:50:07 +00:00
parent 1b117b6aba
commit 63924b6ba0
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.13 2006/06/18 20:49:30 cignoni
Added missing IsD tests
Revision 1.12 2006/05/03 21:23:25 cignoni Revision 1.12 2006/05/03 21:23:25 cignoni
Corrected IsDeleted -> isD Corrected IsDeleted -> isD
@ -185,14 +188,7 @@ void Set( const FacePointer pf, const int nz )
v[1] = pf->V((nz+1)%3); v[1] = pf->V((nz+1)%3);
assert(v[0] != v[1]); assert(v[0] != v[1]);
if( v[0] > v[1] ) if( v[0] > v[1] ) swap(v[0],v[1]);
{
// swap(v[0],v[1]);
VertexPointer t = v[0];
v[0] = v[1];
v[1] = t;
}
f = pf; f = pf;
z = nz; z = nz;
} }
@ -241,22 +237,19 @@ static void FaceBorderFromNone(MeshType &m)
sort(e.begin(), e.end()); // Lo ordino per vertici sort(e.begin(), e.end()); // Lo ordino per vertici
typename std::vector<EdgeSorter>::iterator pe,ps; typename std::vector<EdgeSorter>::iterator pe,ps;
for(ps = e.begin(), pe = e.begin(); pe != e.end(); ++pe) // Scansione vettore ausiliario for(ps = e.begin(), pe=e.begin(); pe<=e.end(); ++pe) // Scansione vettore ausiliario
{ {
if( pe == e.end() || *pe != *ps ) // Trovo blocco di edge uguali if( pe==e.end() || *pe != *ps ) // Trovo blocco di edge uguali
{
if(pe - ps == 1)
{ {
if(pe-ps==1) {
//++nborder; //++nborder;
ps->f->SetB(ps->z); ps->f->SetB(ps->z);
} } else
else if (pe - ps != 2) if(pe-ps!=2) { // Caso complex!!
{ // Caso complex!! for(;ps!=pe;++ps)
for(; ps != pe; ++ps)
ps->f->SetB(ps->z); // Si settano border anche i complex. ps->f->SetB(ps->z); // Si settano border anche i complex.
} }
ps = pe; ps = pe;
// ++ne; // Aggiorno il numero di edge // ++ne; // Aggiorno il numero di edge
} }
} }
@ -264,7 +257,7 @@ static void FaceBorderFromNone(MeshType &m)
} }
/// Bisogna carlcolare il border flag delle facce /// Compute the PerVertex Border flag deriving it from the faces
static void VertexBorderFromFace(MeshType &m) static void VertexBorderFromFace(MeshType &m)
{ {
assert(HasPerFaceFlags(m)); assert(HasPerFaceFlags(m));
@ -275,6 +268,7 @@ static void VertexBorderFromFace(MeshType &m)
(*v).ClearB(); (*v).ClearB();
for(f=m.face.begin();f!=m.face.end();++f) for(f=m.face.begin();f!=m.face.end();++f)
if(!(*f).IsD())
{ {
for(int z=0;z<3;++z) for(int z=0;z<3;++z)
if( (*f).IsB(z) ) if( (*f).IsB(z) )