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

chenged GridDoRay to GridDoRay2D.. corrected one bug in the initial #define

This commit is contained in:
Nico Pietroni 2014-08-08 21:32:50 +00:00
parent 9b6833e521
commit ad69d7d893
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vcg/space/index/index2D/grid_closest_2D.h
View File

@ -21,8 +21,8 @@
* * * *
****************************************************************************/ ****************************************************************************/
#ifndef __VCGLIB_GRID_CLOSEST #ifndef __VCGLIB_GRID_CLOSEST_2D
#define __VCGLIB_GRID_CLOSEST #define __VCGLIB_GRID_CLOSEST_2D
#include <vcg/space/index/index2D/space_iterators_2D.h> #include <vcg/space/index/index2D/space_iterators_2D.h>
#include <vcg/space/intersection2.h> #include <vcg/space/intersection2.h>
@ -175,7 +175,7 @@ typename SPATIAL_INDEX::ObjPtr GridClosest2D(SPATIAL_INDEX &Si,
} }
template <class SPATIALINDEXING,class OBJRAYISECTFUNCTOR, class OBJMARKER> template <class SPATIALINDEXING,class OBJRAYISECTFUNCTOR, class OBJMARKER>
typename SPATIALINDEXING::ObjPtr GridDoRay(SPATIALINDEXING &_Si, typename SPATIALINDEXING::ObjPtr GridDoRay2D(SPATIALINDEXING &_Si,
OBJRAYISECTFUNCTOR &_rayIntersector, OBJRAYISECTFUNCTOR &_rayIntersector,
OBJMARKER &_marker, OBJMARKER &_marker,
const Ray2<typename SPATIALINDEXING::ScalarType> & _ray, const Ray2<typename SPATIALINDEXING::ScalarType> & _ray,

2
vcg/space/index/index2D/grid_static_ptr_2D.h
View File

@ -171,7 +171,7 @@ public:
const Ray2<ScalarType> & _ray, const ScalarType & _maxDist, const Ray2<ScalarType> & _ray, const ScalarType & _maxDist,
ScalarType & _t) ScalarType & _t)
{ {
return(vcg::GridDoRay<MyGridType,OBJRAYISECTFUNCTOR,OBJMARKER>(*this,_rayIntersector,_marker,_ray,_maxDist,_t)); return(vcg::GridDoRay2D<MyGridType,OBJRAYISECTFUNCTOR,OBJMARKER>(*this,_rayIntersector,_marker,_ray,_maxDist,_t));
} }