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

included distance.h changed Dist to vcg::face::PointDistance

This commit is contained in:
Nico Pietroni 2005-01-21 17:13:09 +00:00
parent b7b23d4140
commit cc767faf90
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.1 2004/10/04 15:32:16 ganovelli
moved from metro core
Revision 1.6 2004/05/14 00:34:36 ganovelli Revision 1.6 2004/05/14 00:34:36 ganovelli
header added header added
@ -37,6 +40,7 @@ header added
#include <vcg/space/box3.h> #include <vcg/space/box3.h>
#include <vcg/space/point4.h> #include <vcg/space/point4.h>
#include <vcg/math/base.h> #include <vcg/math/base.h>
#include <vcg/simplex/face/distance.h>
#include <vcg/space/index/grid_static_ptr.h> #include <vcg/space/index/grid_static_ptr.h>
@ -121,7 +125,7 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
if( ! mesh.IsMarked( &*(l->Elem())) ) if( ! mesh.IsMarked( &*(l->Elem())) )
{ {
if( Dist((*(l->Elem())), p, error, q) ) if( vcg::face::PointDistance<MESH::FaceType>((*(l->Elem())), p, error, q) )
{ {
bestq = q; bestq = q;
bestf = l->Elem(); bestf = l->Elem();
@ -163,7 +167,7 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
for(l=first;l!=last;++l) for(l=first;l!=last;++l)
if( ! mesh.IsMarked( &*(l->Elem())) ) if( ! mesh.IsMarked( &*(l->Elem())) )
{ {
if( Dist((*(l->Elem())), p, error, q) ) if( vcg::face::PointDistance<MESH::FaceType>((*(l->Elem())), p, error, q) )
{ {
bestq = q; bestq = q;
bestf = l->Elem(); bestf = l->Elem();