mirror of https://github.com/CGAL/cgal
rename macro
This commit is contained in:
parent
dd383da307
commit
ed521e03b0
|
|
@ -523,8 +523,8 @@ public:
|
||||||
return r_domain_.bounding_aabb_tree_ptr()->
|
return r_domain_.bounding_aabb_tree_ptr()->
|
||||||
first_intersected_primitive(ray);
|
first_intersected_primitive(ray);
|
||||||
}
|
}
|
||||||
|
#define CGAL_USE_ALL_INTERSECTIONS 0
|
||||||
#if USE_ALL_INTERSECTIONS
|
#if CGAL_USE_ALL_INTERSECTIONS
|
||||||
boost::optional<AABB_primitive_id> shoot_a_ray_2(const Ray_3 ray) const {
|
boost::optional<AABB_primitive_id> shoot_a_ray_2(const Ray_3 ray) const {
|
||||||
const Point_3& p = ray.source();
|
const Point_3& p = ray.source();
|
||||||
typedef typename AABB_tree::
|
typedef typename AABB_tree::
|
||||||
|
|
@ -551,7 +551,7 @@ public:
|
||||||
return it->second;
|
return it->second;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif // USE_ALL_INTERSECTIONS
|
#endif // CGAL_USE_ALL_INTERSECTIONS
|
||||||
|
|
||||||
Subdomain operator()(const Point_3& p) const {
|
Subdomain operator()(const Point_3& p) const {
|
||||||
if(r_domain_.bounding_aabb_tree_ptr() == 0) return Subdomain();
|
if(r_domain_.bounding_aabb_tree_ptr() == 0) return Subdomain();
|
||||||
|
|
@ -573,8 +573,7 @@ public:
|
||||||
|
|
||||||
const Ray_3 ray_shot = ray(p, vector(CGAL::ORIGIN,*random_point));
|
const Ray_3 ray_shot = ray(p, vector(CGAL::ORIGIN,*random_point));
|
||||||
|
|
||||||
#define USE_ALL_INTERSECTIONS 0
|
#if CGAL_USE_ALL_INTERSECTIONS
|
||||||
#if USE_ALL_INTERSECTIONS
|
|
||||||
boost::optional<AABB_primitive_id> opt = shoot_a_ray_2(ray_shot);
|
boost::optional<AABB_primitive_id> opt = shoot_a_ray_2(ray_shot);
|
||||||
#else // first_intersected_primitive
|
#else // first_intersected_primitive
|
||||||
boost::optional<AABB_primitive_id> opt = shoot_a_ray_1(ray_shot);
|
boost::optional<AABB_primitive_id> opt = shoot_a_ray_1(ray_shot);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue