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

Avoid copying arrays

This commit is contained in:
Mael Rouxel-Labbé 2021-09-10 18:12:30 +02:00
parent afa4279a54
commit 7049d667e5
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Intersections_3/include/CGAL/Intersections_3/internal/Bbox_3_Triangle_3_do_intersect.h
View File

@ -196,9 +196,10 @@ Uncertain<bool> do_axis_intersect(const std::array< std::array<FT, 3> , 3>& tria
const Box3& bbox, const Box3& bbox,
Fct do_axis_intersect_aux_impl) Fct do_axis_intersect_aux_impl)
{ {
// TODO: no longer a ptr, is it an issue for swap? const std::array<FT, 3>& j = triangle[SIDE];
std::array<FT, 3> j = triangle[SIDE]; const std::array<FT, 3>& k = triangle[(SIDE+2)%3];
std::array<FT, 3> k = triangle[(SIDE+2)%3]; const std::array<FT, 3>* j_ptr = &j;
const std::array<FT, 3>* k_ptr = &k;
std::array<FT, 3> p_min, p_max; std::array<FT, 3> p_min, p_max;
get_min_max<FT, Box3, AXE>(AXE==0? 0: AXE==1? sides[SIDE][2]: -sides[SIDE][1], get_min_max<FT, Box3, AXE>(AXE==0? 0: AXE==1? sides[SIDE][2]: -sides[SIDE][1],
@ -215,10 +216,12 @@ Uncertain<bool> do_axis_intersect(const std::array< std::array<FT, 3> , 3>& tria
if(is_indeterminate(b)) if(is_indeterminate(b))
return b; return b;
if(b) if(b)
std::swap(j,k); std::swap(j_ptr, k_ptr);
return CGAL_AND((do_axis_intersect_aux_A0<FT,SIDE>(p_min[1]-j[1], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE), return CGAL_AND((do_axis_intersect_aux_A0<FT,SIDE>(p_min[1]-(*j_ptr)[1], p_min[2]-(*j_ptr)[2],
(do_axis_intersect_aux_A0<FT,SIDE>(p_max[1]-k[1], p_max[2]-k[2], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); sides, do_axis_intersect_aux_impl) != POSITIVE),
(do_axis_intersect_aux_A0<FT,SIDE>(p_max[1]-(*k_ptr)[1], p_max[2]-(*k_ptr)[2],
sides, do_axis_intersect_aux_impl) != NEGATIVE) );
} }
case 1: case 1:
{ {
@ -227,11 +230,12 @@ Uncertain<bool> do_axis_intersect(const std::array< std::array<FT, 3> , 3>& tria
if(is_indeterminate(b)) if(is_indeterminate(b))
return b; return b;
if(b) if(b)
std::swap(j,k); std::swap(j_ptr, k_ptr);
return CGAL_AND((do_axis_intersect_aux_A1<FT,SIDE>(p_min[0]-j[0], p_min[2]-j[2], sides, do_axis_intersect_aux_impl) != POSITIVE),
(do_axis_intersect_aux_A1<FT,SIDE>(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<FT,SIDE>(p_min[0]-(*j_ptr)[0], p_min[2]-(*j_ptr)[2],
sides, do_axis_intersect_aux_impl) != POSITIVE),
(do_axis_intersect_aux_A1<FT,SIDE>(p_max[0]-(*k_ptr)[0], p_max[2]-(*k_ptr)[2],
sides, do_axis_intersect_aux_impl) != NEGATIVE) );
} }
case 2: case 2:
{ {
@ -239,15 +243,15 @@ Uncertain<bool> do_axis_intersect(const std::array< std::array<FT, 3> , 3>& tria
Uncertain<bool> b = do_axis_intersect_aux_A2<FT,SIDE>(k[0]-j[0], k[1]-j[1], sides, do_axis_intersect_aux_impl) != NEGATIVE; Uncertain<bool> b = do_axis_intersect_aux_A2<FT,SIDE>(k[0]-j[0], k[1]-j[1], sides, do_axis_intersect_aux_impl) != NEGATIVE;
if(is_indeterminate(b)) if(is_indeterminate(b))
return b; return b;
if(b) if(b)
std::swap(j,k); std::swap(j_ptr, k_ptr);
return CGAL_AND((do_axis_intersect_aux_A2<FT,SIDE>(p_min[0]-j[0], p_min[1]-j[1], sides, do_axis_intersect_aux_impl) != POSITIVE), return CGAL_AND((do_axis_intersect_aux_A2<FT,SIDE>(p_min[0]-(*j_ptr)[0], p_min[1]-(*j_ptr)[1],
(do_axis_intersect_aux_A2<FT,SIDE>(p_max[0]-k[0], p_max[1]-k[1], sides, do_axis_intersect_aux_impl) != NEGATIVE) ); sides, do_axis_intersect_aux_impl) != POSITIVE),
(do_axis_intersect_aux_A2<FT,SIDE>(p_max[0]-(*k_ptr)[0], p_max[1]-(*k_ptr)[1],
sides, do_axis_intersect_aux_impl) != NEGATIVE) );
} }
default: default: // Should not happen
// Should not happen
CGAL_error(); CGAL_error();
return make_uncertain(false); return make_uncertain(false);
} }