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

fixed some bugs

This commit is contained in:
Paolo Cignoni 2005-10-03 16:19:07 +00:00
parent ecdb5c6ad4
commit 5182d24c7f
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,10 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.15 2005/10/03 13:59:39 pietroni
added GetInSphere and GetInBox functions
rensmed Functions respectively with Face suffix or Vertex suffix for query on vertex or faces
Revision 1.14 2005/09/30 13:10:37 pietroni Revision 1.14 2005/09/30 13:10:37 pietroni
used functor defined in face/distance.h for distance point-face used functor defined in face/distance.h for distance point-face
used functor defined in intersection3.h for ray-triangle intersection used functor defined in intersection3.h for ray-triangle intersection
@ -171,8 +175,12 @@ namespace vcg {
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<SCALAR> _ip; Point3<GRID::ScalarType> _ip;
return (GetClosest<MESH,GRID>(mesh,gr,_p,_maxDist,_minDist,_closestPt,_normf,ip)); typedef FaceTmark<MESH> MarkerFace;
MarkerFace mf;
mf.SetMesh(&mesh);
typedef vcg::face::PointDistanceFunctor FDistFunct;
return ( gr.GetClosest<FDistFunct,MarkerFace>(FDistFunct(),mf,_p,_maxDist,_minDist,_closestPt) );
} }
template <class MESH, class GRID> template <class MESH, class GRID>
@ -192,8 +200,7 @@ namespace vcg {
template <class MESH, class GRID> template <class MESH, class GRID>
typename MESH::VertexType * GetClosestVertex( MESH & mesh,GRID & gr,const typename GRID::CoordType & _p, typename MESH::VertexType * GetClosestVertex( 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)
{ {
typedef GRID::ScalarType ScalarType; typedef GRID::ScalarType ScalarType;
typedef Point3<ScalarType> Point3x; typedef Point3<ScalarType> Point3x;
@ -202,7 +209,8 @@ namespace vcg {
mv.SetMesh(&mesh); mv.SetMesh(&mesh);
typedef vcg::vertex::PointDistanceFunctor VDistFunct; typedef vcg::vertex::PointDistanceFunctor VDistFunct;
_minDist=_maxDist; _minDist=_maxDist;
return (gr.GetClosest<VDistFunct,MarkerFace>(VDistFunct(),mv,_p,_maxDist,_minDist,_closestPt)); Point3x _closestPt;
return (gr.GetClosest<VDistFunct,MarkerVert>(VDistFunct(),mv,_p,_maxDist,_minDist,_closestPt));
} }
template <class MESH, class GRID, class OBJPTRCONTAINER,class DISTCONTAINER, class POINTCONTAINER> template <class MESH, class GRID, class OBJPTRCONTAINER,class DISTCONTAINER, class POINTCONTAINER>