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

added if (!l->Elem()->IsD()) test on each element

This commit is contained in:
Nico Pietroni 2005-02-08 17:49:38 +00:00
parent 5613d4c584
commit 06adb386ad
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2005/01/28 12:00:33 cignoni
small gcc compiling issues for namespaces
Revision 1.3 2005/01/24 11:47:23 cignoni Revision 1.3 2005/01/24 11:47:23 cignoni
Now used also by the official Metro Now used also by the official Metro
Removed using namespace (NEVER IN HEADERS!) Removed using namespace (NEVER IN HEADERS!)
@ -128,7 +131,8 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
A2UGridLink *first, *last, *l; A2UGridLink *first, *last, *l;
gr.Grid( gx, gy, gz, first, last ); gr.Grid( gx, gy, gz, first, last );
for(l=first;l!=last;++l) for(l=first;l!=last;++l)
if (!l->Elem()->IsD())
{
if( ! mesh.IsMarked( &*(l->Elem())) ) if( ! mesh.IsMarked( &*(l->Elem())) )
{ {
if( face::PointDistance((*(l->Elem())), p, error, q) ) if( face::PointDistance((*(l->Elem())), p, error, q) )
@ -140,6 +144,7 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
mesh.Mark( &*(l->Elem()) ); mesh.Mark( &*(l->Elem()) );
} }
} }
}
else else
{ {
for(int ix=gx-s;ix<=gx+s;++ix) for(int ix=gx-s;ix<=gx+s;++ix)
@ -156,6 +161,8 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
A2UGridLink *first, *last, *l; A2UGridLink *first, *last, *l;
gr.Grid( ix, iy, iz, first, last ); gr.Grid( ix, iy, iz, first, last );
for(l=first;l!=last;++l) for(l=first;l!=last;++l)
if (!l->Elem()->IsD())
{
if( ! mesh.IsMarked( &*(l->Elem())) ) if( ! mesh.IsMarked( &*(l->Elem())) )
{ {
if( vcg::face::PointDistance((*(l->Elem())), p, error, q) ) if( vcg::face::PointDistance((*(l->Elem())), p, error, q) )
@ -169,6 +176,7 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
} }
} }
} }
}
if( fabs(error)<vdist ) if( fabs(error)<vdist )
break; break;