From 5b984e817d625333db78beea99b1e6f2c06f0866 Mon Sep 17 00:00:00 2001 From: cignoni Date: Fri, 28 Jan 2005 12:00:33 +0000 Subject: [PATCH] small gcc compiling issues for namespaces --- vcg/complex/trimesh/closest.h | 10 ++++++++-- vcg/simplex/face/distance.h | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/vcg/complex/trimesh/closest.h b/vcg/complex/trimesh/closest.h index f05c6aa8..4060cd22 100644 --- a/vcg/complex/trimesh/closest.h +++ b/vcg/complex/trimesh/closest.h @@ -24,6 +24,12 @@ History $Log: not supported by cvs2svn $ +Revision 1.3 2005/01/24 11:47:23 cignoni +Now used also by the official Metro +Removed using namespace (NEVER IN HEADERS!) +Made the computation of barycentric coords only when necessary +Renamed Mindistpoint to Closest + Revision 1.2 2005/01/21 17:13:09 pietroni included distance.h changed Dist to vcg::face::PointDistance @@ -125,7 +131,7 @@ void Closest( MESH & mesh, const Point3 & p, GRID & gr, SCALAR & mdist, if( ! mesh.IsMarked( &*(l->Elem())) ) { - if( vcg::face::PointDistance((*(l->Elem())), p, error, q) ) + if( face::PointDistance((*(l->Elem())), p, error, q) ) { bestq = q; bestf = l->Elem(); @@ -152,7 +158,7 @@ void Closest( MESH & mesh, const Point3 & p, GRID & gr, SCALAR & mdist, for(l=first;l!=last;++l) if( ! mesh.IsMarked( &*(l->Elem())) ) { - if( vcg::face::PointDistance((*(l->Elem())), p, error, q) ) + if( vcg::face::PointDistance((*(l->Elem())), p, error, q) ) { bestq = q; bestf = l->Elem(); diff --git a/vcg/simplex/face/distance.h b/vcg/simplex/face/distance.h index ddda8283..976a570f 100644 --- a/vcg/simplex/face/distance.h +++ b/vcg/simplex/face/distance.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.3 2005/01/24 15:35:25 cignoni +Removed a 'using namespace' + Revision 1.2 2005/01/21 17:11:03 pietroni changed Dist Function to PointDistance... the function is on vcg::face::PointDistance this file will contain all distance functions between a face and othe entities @@ -69,9 +72,9 @@ namespace vcg { */ template bool PointDistance( const FaceType &f, - const Point3 & q, + const vcg::Point3 & q, typename FaceType::ScalarType & dist, - Point3 & p ) + vcg::Point3 & p ) { typedef typename FaceType::ScalarType ScalarType;