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

Fix typo size/side

This commit is contained in:
Laurent Rineau 2022-08-24 16:18:26 +02:00
parent c573ccb827
commit c61e3a978b
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -273,13 +273,13 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
}}; }};
int forbidden_axis = -1; int forbidden_axis = -1;
int forbidden_size = -1; int forbidden_side = -1;
//determine whether one vector is collinear with an axis //determine whether one vector is collinear with an axis
int tmp = collinear_axis<FT>(sides[0]); int tmp = collinear_axis<FT>(sides[0]);
if(tmp != -1) if(tmp != -1)
{ {
forbidden_axis = tmp; forbidden_axis = tmp;
forbidden_size = 0; forbidden_side = 0;
} }
else else
{ {
@ -287,7 +287,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
if(tmp != -1) if(tmp != -1)
{ {
forbidden_axis = tmp; forbidden_axis = tmp;
forbidden_size = 1; forbidden_side = 1;
} }
else else
{ {
@ -295,7 +295,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
if(tmp != -1) if(tmp != -1)
{ {
forbidden_axis = tmp; forbidden_axis = tmp;
forbidden_size = 2; forbidden_side = 2;
} }
} }
} }
@ -305,7 +305,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
if(forbidden_axis != 0) if(forbidden_axis != 0)
{ {
if(forbidden_size != 0) if(forbidden_side != 0)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,0,0>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,0,0>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -314,7 +314,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 1) if(forbidden_side != 1)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,0,1>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,0,1>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -323,7 +323,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 2) if(forbidden_side != 2)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,0,2>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,0,2>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -335,7 +335,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
if(forbidden_axis != 1) if(forbidden_axis != 1)
{ {
if(forbidden_size != 0) if(forbidden_side != 0)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,1,0>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,1,0>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -344,7 +344,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 1) if(forbidden_side != 1)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,1,1>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,1,1>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -353,7 +353,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 2) if(forbidden_side != 2)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,1,2>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,1,2>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -365,7 +365,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
if(forbidden_axis != 2) if(forbidden_axis != 2)
{ {
if(forbidden_size != 0) if(forbidden_side != 0)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,2,0>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,2,0>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -374,7 +374,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 1) if(forbidden_side != 1)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,2,1>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,2,1>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))
@ -383,7 +383,7 @@ do_intersect_bbox_or_iso_cuboid_impl(const std::array< std::array<FT, 3>, 3>& tr
return false; return false;
} }
if(forbidden_size != 2) if(forbidden_side != 2)
{ {
Uncertain<bool> b = do_axis_intersect<FT,Box3,2,2>(triangle, sides, bbox, do_axis_intersect_aux_impl); Uncertain<bool> b = do_axis_intersect<FT,Box3,2,2>(triangle, sides, bbox, do_axis_intersect_aux_impl);
if(is_indeterminate(b)) if(is_indeterminate(b))