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

Comment out the do_intersect tests 

They caused a performance problem when used with the tweaked AABB_traits
of Surface_mesh_segmentation.
This commit is contained in:
Philipp Möller 2015-11-26 13:37:42 +01:00 committed by Sébastien Loriot
parent 649fabe67b
commit 54d8839ac9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,7 +78,7 @@ public:
case 2: // Left & right child both leaves case 2: // Left & right child both leaves
{ {
//left child //left child
if(!skip(current.node->left_data().id()) && 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(!skip(current.node->right_data().id()) && 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);
@ -105,7 +105,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(!skip(current.node->left_data().id()) && 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);