songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use nested class for dispatch

This commit is contained in:
Sébastien Loriot 2021-03-10 13:59:00 +01:00
parent b5239161c4
commit ac708f6625
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
AABB_tree/include/CGAL/AABB_traits.h
View File

@ -24,6 +24,8 @@
#include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h> #include <CGAL/internal/AABB_tree/Has_nested_type_Shared_data.h>
#include <CGAL/internal/AABB_tree/Is_ray_intersection_geomtraits.h> #include <CGAL/internal/AABB_tree/Is_ray_intersection_geomtraits.h>
#include <CGAL/internal/AABB_tree/Primitive_helper.h> #include <CGAL/internal/AABB_tree/Primitive_helper.h>
#include <CGAL/internal/Has_boolean_tags.h>
#include <boost/optional.hpp> #include <boost/optional.hpp>
@ -414,7 +416,7 @@ public:
CGAL::SMALLER : CGAL::LARGER; CGAL::SMALLER : CGAL::LARGER;
} }
CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound, Tag_true&) const CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound, const Tag_true&) const
{ {
return GeomTraits().do_intersect_3_object() return GeomTraits().do_intersect_3_object()
(GeomTraits().construct_sphere_3_object() (GeomTraits().construct_sphere_3_object()
@ -422,7 +424,7 @@ public:
CGAL::SMALLER : CGAL::LARGER; CGAL::SMALLER : CGAL::LARGER;
} }
CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound, Tag_false&) const CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound, const Tag_false&) const
{ {
return GeomTraits().do_intersect_3_object() return GeomTraits().do_intersect_3_object()
(GeomTraits().construct_sphere_3_object() (GeomTraits().construct_sphere_3_object()
@ -430,9 +432,21 @@ public:
CGAL::SMALLER : CGAL::LARGER; CGAL::SMALLER : CGAL::LARGER;
} }
template <typename GT, bool HasTag = internal::Has_nested_type_Has_static_filters<GeomTraits>::value>
struct Use_conservative_static_filters
{
typedef CGAL::Tag_false type;
};
template <typename GT>
struct Use_conservative_static_filters<GT, true>
{
typedef CGAL::Boolean_tag<GT::Has_static_filters> type;
};
CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound) const CGAL::Comparison_result operator()(const Point& p, const Bounding_box& bb, const Point& bound) const
{ {
return (*this)(p, bb, bound, typename GeomTraits::Has_filtered_predicates_tag()); return (*this)(p, bb, bound, typename Use_conservative_static_filters<GeomTraits>::type());
} }
template <class Solid> template <class Solid>