From 1ea84f29541fc4abd7aedcead2806c5c71fbf52c Mon Sep 17 00:00:00 2001 From: nicopietroni Date: Wed, 8 Feb 2006 17:02:41 +0000 Subject: [PATCH] commented one GetClosestFace function ... the code is the same then getClosest that return barycentric coordinates --- vcg/complex/trimesh/closest.h | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/vcg/complex/trimesh/closest.h b/vcg/complex/trimesh/closest.h index 3bb1cf1e..03b99518 100644 --- a/vcg/complex/trimesh/closest.h +++ b/vcg/complex/trimesh/closest.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.19 2006/01/10 13:31:54 pietroni +correct pass of variable closest_pt by reference in getclosestFace function + Revision 1.18 2005/12/02 00:13:34 cignoni Added and removed typenames for gcc compiling. removed also some template arguments specifcation that gcc disliked... @@ -181,7 +184,7 @@ namespace vcg { return (0); } - template + /*template typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist, typename GRID::CoordType &_closestPt,typename GRID::CoordType & _normf) @@ -191,8 +194,8 @@ namespace vcg { MarkerFace mf; mf.SetMesh(&mesh); vcg::face::PointDistanceFunctor FDistFunct; - return ( gr.GetClosest(FDistFunct,mf,_p,_maxDist,_minDist,_closestPt) ); - } + typename MESH::FaceType* bestf= gr.GetClosest(FDistFunct,mf,_p,_maxDist,_minDist,_closestPt) ); + }*/ template typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, @@ -357,10 +360,10 @@ namespace vcg { ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){} -// Commented out: it seems unuseful and make gcc complain. p. - /* void SetMesh(MeshType *m) - {tm.SetMesh(m);}*/ - }; +//// Commented out: it seems unuseful and make gcc complain. p. +// void SetMesh(MeshType *m) +// {this->tm.SetMesh(m);} +// }; template class TriRayIterator:public vcg::RayIterator,FaceTmark > @@ -376,11 +379,11 @@ namespace vcg { TriRayIterator(GridType &_Si):RayBaseType(_Si,FintFunct()){} -// Commented out: it seems unuseful and make gcc complain. p. - /* void SetMesh(MeshType *m) - {tm.SetMesh(m);}*/ - - }; +//// Commented out: it seems unuseful and make gcc complain. p. +// void SetMesh(MeshType *m) +// {this->tm.SetMesh(m);} +// +// }; } // end namespace trimesh } // end namespace vcg