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

correct pass of variable closest_pt by reference in getclosestFace function

This commit is contained in:
Nico Pietroni 2006-01-10 13:31:54 +00:00
parent eb11ec57e0
commit 4bc0fa600a
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,11 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
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...
commented out GetInSphereFace and SetMesh that are probably never used and i didnt succeed in compile
Revision 1.17 2005/10/05 17:02:52 pietroni Revision 1.17 2005/10/05 17:02:52 pietroni
corrected bugs on GEtKClosestVert and GetInSphereVert corrected bugs on GEtKClosestVert and GetInSphereVert
@ -145,7 +150,7 @@ namespace vcg {
template <class MESH, class GRID> template <class MESH, class GRID>
typename MESH::FaceType * GetClosestFace( MESH & mesh, GRID & gr, const typename GRID::CoordType & _p, typename MESH::FaceType * GetClosestFace( MESH & mesh, GRID & gr, const typename GRID::CoordType & _p,
const typename GRID::ScalarType & _maxDist, typename GRID::ScalarType & _minDist, const typename GRID::ScalarType & _maxDist, typename GRID::ScalarType & _minDist,
typename GRID::CoordType _closestPt, typename GRID::CoordType & _normf, typename GRID::CoordType &_closestPt, typename GRID::CoordType & _normf,
typename GRID::CoordType & _ip) typename GRID::CoordType & _ip)
{ {
typedef typename GRID::ScalarType ScalarType; typedef typename GRID::ScalarType ScalarType;
@ -179,7 +184,7 @@ namespace vcg {
template <class MESH, class GRID> template <class MESH, class GRID>
typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p,
const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist, const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist,
typename GRID::CoordType _closestPt,typename GRID::CoordType & _normf) typename GRID::CoordType &_closestPt,typename GRID::CoordType & _normf)
{ {
Point3<typename GRID::ScalarType> _ip; Point3<typename GRID::ScalarType> _ip;
typedef FaceTmark<MESH> MarkerFace; typedef FaceTmark<MESH> MarkerFace;
@ -192,7 +197,7 @@ namespace vcg {
template <class MESH, class GRID> template <class MESH, class GRID>
typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, typename MESH::FaceType * GetClosestFace( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p,
const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist, const typename GRID::ScalarType & _maxDist,typename GRID::ScalarType & _minDist,
typename GRID::CoordType _closestPt) typename GRID::CoordType &_closestPt)
{ {
typedef typename GRID::ScalarType ScalarType; typedef typename GRID::ScalarType ScalarType;
typedef Point3<ScalarType> Point3x; typedef Point3<ScalarType> Point3x;
@ -353,8 +358,8 @@ namespace vcg {
ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){} ClosestVertexIterator(GridType &_Si):ClosestBaseType(_Si,VDistFunct()){}
// Commented out: it seems unuseful and make gcc complain. p. // Commented out: it seems unuseful and make gcc complain. p.
// void SetMesh(MeshType *m) /* void SetMesh(MeshType *m)
// {tm.SetMesh(m);} {tm.SetMesh(m);}*/
}; };
template <class GRID,class MESH> template <class GRID,class MESH>
@ -372,8 +377,8 @@ namespace vcg {
TriRayIterator(GridType &_Si):RayBaseType(_Si,FintFunct()){} TriRayIterator(GridType &_Si):RayBaseType(_Si,FintFunct()){}
// Commented out: it seems unuseful and make gcc complain. p. // Commented out: it seems unuseful and make gcc complain. p.
// void SetMesh(MeshType *m) /* void SetMesh(MeshType *m)
// {tm.SetMesh(m);} {tm.SetMesh(m);}*/
}; };