From a95858fc555f8ee22fd7f3536da9f5af62cd3390 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Tue, 31 Aug 2021 08:56:56 +0100 Subject: [PATCH] Revert "Work around CGAL_AND as explained in the manual" This reverts commit 7d2321cecd791812de3142e70da2165959bf9b35. --- .../internal/Bbox_3_Triangle_3_do_intersect.h | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Intersections_3/include/CGAL/Intersections_3/internal/Bbox_3_Triangle_3_do_intersect.h b/Intersections_3/include/CGAL/Intersections_3/internal/Bbox_3_Triangle_3_do_intersect.h index e6b2b9d097f..9cff1b4b690 100644 --- a/Intersections_3/include/CGAL/Intersections_3/internal/Bbox_3_Triangle_3_do_intersect.h +++ b/Intersections_3/include/CGAL/Intersections_3/internal/Bbox_3_Triangle_3_do_intersect.h @@ -213,13 +213,8 @@ namespace internal { if (is_indeterminate(b)) return b; if(b) std::swap(j,k); - Uncertain tmp = do_axis_intersect_aux_A0(p_min[1]-j[1], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE; - - return certainly_not(tmp) ? make_uncertain(false) : tmp & (do_axis_intersect_aux_A0(p_max[1]-k[1], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE); - - - //return CGAL_AND((do_axis_intersect_aux_A0(p_min[1]-j[1], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE), - // (do_axis_intersect_aux_A0(p_max[1]-k[1], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); + return CGAL_AND((do_axis_intersect_aux_A0(p_min[1]-j[1], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE), + (do_axis_intersect_aux_A0(p_max[1]-k[1], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); } case 1: { // t_max >= t_min @@ -227,9 +222,8 @@ namespace internal { if (is_indeterminate(b)) return b; if(b) std::swap(j,k); - - Uncertain tmp = do_axis_intersect_aux_A1(p_min[0]-j[0], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE; - return certainly_not(tmp) ? make_uncertain(false) : tmp & (do_axis_intersect_aux_A1(p_max[0]-k[0], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE); + return CGAL_AND((do_axis_intersect_aux_A1(p_min[0]-j[0], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE), + (do_axis_intersect_aux_A1(p_max[0]-k[0], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); } case 2: { @@ -238,9 +232,8 @@ namespace internal { if ( is_indeterminate(b)) return b; if(b) std::swap(j,k); - - Uncertain tmp = do_axis_intersect_aux_A2(p_min[0]-j[0], p_min[1]-j[1], sides, do_axis_intersect_aux_impl) != POSITIVE; - return certainly_not(tmp) ? make_uncertain(false) : tmp &(do_axis_intersect_aux_A2(p_max[0]-k[0], p_max[1]-k[1], sides, do_axis_intersect_aux_impl) != NEGATIVE); + return CGAL_AND((do_axis_intersect_aux_A2(p_min[0]-j[0], p_min[1]-j[1], sides, do_axis_intersect_aux_impl) != POSITIVE), + (do_axis_intersect_aux_A2(p_max[0]-k[0], p_max[1]-k[1], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); } default: // Should not happen