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

Add the ability to use skip functor

This commit is contained in:
Philipp Möller 2015-11-13 11:13:48 +01:00 committed by Sébastien Loriot
parent 83d7396cd8
commit bfb36df712
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
AABB_tree/include/CGAL/AABB_tree.h
View File

@ -399,9 +399,9 @@ public:
// //
// `AABBTraits` must be a model of `AABBRayIntersectionTraits` to // `AABBTraits` must be a model of `AABBRayIntersectionTraits` to
// call this member function. // call this member function.
template<typename Ray> template<typename Ray, typename SkipFunctor>
boost::optional< typename Intersection_and_primitive_id<Ray>::Type > boost::optional< typename Intersection_and_primitive_id<Ray>::Type >
ray_intersection(const Ray& query) const; ray_intersection(const Ray& query, SkipFunctor skip) const;
///@} ///@}
@ -538,9 +538,8 @@ public:
///@} ///@}
private: private:
template<typename AABBTree> template<typename AABBTree, typename SkipFunctor>
friend friend class AABB_ray_intersection;
class AABB_ray_intersection;
// clear nodes // clear nodes
void clear_nodes() void clear_nodes()

18
AABB_tree/include/CGAL/internal/AABB_tree/AABB_ray_intersection.h
View File

@ -32,7 +32,7 @@
namespace CGAL { namespace CGAL {
template<typename AABBTree> template<typename AABBTree, typename SkipFunctor>
class AABB_ray_intersection { class AABB_ray_intersection {
typedef typename AABBTree::AABB_traits AABB_traits; typedef typename AABBTree::AABB_traits AABB_traits;
typedef typename AABB_traits::Ray_3 Ray; typedef typename AABB_traits::Ray_3 Ray;
@ -42,7 +42,7 @@ public:
AABB_ray_intersection(const AABBTree& tree) : tree_(tree) {} AABB_ray_intersection(const AABBTree& tree) : tree_(tree) {}
boost::optional< Ray_intersection_and_primitive_id > boost::optional< Ray_intersection_and_primitive_id >
ray_intersection(const Ray& query) const { ray_intersection(const Ray& query, SkipFunctor skip) const {
// We hit the root, now continue on the children. Keep track of // We hit the root, now continue on the children. Keep track of
// nb_primitives through a variable in each Node on the stack. In // nb_primitives through a variable in each Node on the stack. In
// BVH_node::traversal this is done through the function parameter // BVH_node::traversal this is done through the function parameter
@ -78,7 +78,7 @@ public:
case 2: // Left & right child both leaves case 2: // Left & right child both leaves
{ {
//left child //left child
if(do_intersect_obj(query, current.node->left_data())) { if(!skip(current.node->left_data().id()) && do_intersect_obj(query, current.node->left_data())) {
intersection = intersection_obj(query, current.node->left_data()); intersection = intersection_obj(query, current.node->left_data());
if(intersection) { if(intersection) {
FT ray_distance = boost::apply_visitor(param_visitor, intersection->first); FT ray_distance = boost::apply_visitor(param_visitor, intersection->first);
@ -90,7 +90,7 @@ public:
} }
// right child // right child
if(do_intersect_obj(query, current.node->right_data())) { if(!skip(current.node->right_data().id()) && do_intersect_obj(query, current.node->right_data())) {
intersection = intersection_obj(query, current.node->right_data()); intersection = intersection_obj(query, current.node->right_data());
if(intersection) { if(intersection) {
FT ray_distance = boost::apply_visitor(param_visitor, intersection->first); FT ray_distance = boost::apply_visitor(param_visitor, intersection->first);
@ -104,7 +104,7 @@ public:
case 3: // Left child leaf, right child inner node case 3: // Left child leaf, right child inner node
{ {
//left child //left child
if(do_intersect_obj(query, current.node->left_data())) { if(!skip(current.node->left_data().id()) && do_intersect_obj(query, current.node->left_data())) {
intersection = intersection_obj(query, current.node->left_data()); intersection = intersection_obj(query, current.node->left_data());
if(intersection) { if(intersection) {
FT ray_distance = boost::apply_visitor(param_visitor, intersection->first); FT ray_distance = boost::apply_visitor(param_visitor, intersection->first);
@ -179,9 +179,9 @@ private:
}; };
template<typename AABBTraits> template<typename AABBTraits>
template<typename Ray> template<typename Ray, typename SkipFunctor>
boost::optional< typename AABB_tree<AABBTraits>::template Intersection_and_primitive_id<Ray>::Type > boost::optional< typename AABB_tree<AABBTraits>::template Intersection_and_primitive_id<Ray>::Type >
AABB_tree<AABBTraits>::ray_intersection(const Ray& query) const { AABB_tree<AABBTraits>::ray_intersection(const Ray& query, SkipFunctor skip) const {
CGAL_static_assertion_msg((boost::is_same<Ray, typename AABBTraits::Ray_3>::value), CGAL_static_assertion_msg((boost::is_same<Ray, typename AABBTraits::Ray_3>::value),
"Ray and Ray_3 must be the same type"); "Ray and Ray_3 must be the same type");
@ -193,8 +193,8 @@ AABB_tree<AABBTraits>::ray_intersection(const Ray& query) const {
return traits().intersection_object()(query, singleton_data()); return traits().intersection_object()(query, singleton_data());
default: // Tree has >= 2 nodes default: // Tree has >= 2 nodes
if(traits().do_intersect_object()(query, root_node()->bbox())) { if(traits().do_intersect_object()(query, root_node()->bbox())) {
AABB_ray_intersection< AABB_tree<AABBTraits> > ri(*this); AABB_ray_intersection< AABB_tree<AABBTraits>, SkipFunctor > ri(*this);
return ri.ray_intersection(query); return ri.ray_intersection(query, skip);
} else { } else {
// but we don't hit the root // but we don't hit the root
break; break;