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

small gcc compiling issues for namespaces

This commit is contained in:
Paolo Cignoni 2005-01-28 12:00:33 +00:00
parent 1bc21300da
commit 5b984e817d
2 changed files with 13 additions and 4 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,12 @@
History History
$Log: not supported by cvs2svn $ $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 Revision 1.2 2005/01/21 17:13:09 pietroni
included distance.h changed Dist to vcg::face::PointDistance included distance.h changed Dist to vcg::face::PointDistance
@ -125,7 +131,7 @@ void Closest( MESH & mesh, const Point3<SCALAR> & p, GRID & gr, SCALAR & mdist,
if( ! mesh.IsMarked( &*(l->Elem())) ) if( ! mesh.IsMarked( &*(l->Elem())) )
{ {
if( vcg::face::PointDistance<MESH::FaceType>((*(l->Elem())), p, error, q) ) if( face::PointDistance((*(l->Elem())), p, error, q) )
{ {
bestq = q; bestq = q;
bestf = l->Elem(); bestf = l->Elem();
@ -152,7 +158,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( vcg::face::PointDistance<MESH::FaceType>((*(l->Elem())), p, error, q) ) if( vcg::face::PointDistance((*(l->Elem())), p, error, q) )
{ {
bestq = q; bestq = q;
bestf = l->Elem(); bestf = l->Elem();

7
vcg/simplex/face/distance.h
View File

@ -24,6 +24,9 @@
History History
$Log: not supported by cvs2svn $ $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 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 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 <class FaceType> template <class FaceType>
bool PointDistance( const FaceType &f, bool PointDistance( const FaceType &f,
const Point3<typename FaceType::ScalarType> & q, const vcg::Point3<typename FaceType::ScalarType> & q,
typename FaceType::ScalarType & dist, typename FaceType::ScalarType & dist,
Point3<typename FaceType::ScalarType> & p ) vcg::Point3<typename FaceType::ScalarType> & p )
{ {
typedef typename FaceType::ScalarType ScalarType; typedef typename FaceType::ScalarType ScalarType;