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

Fix calls to min and max

This commit is contained in:
Andreas Fabri 2021-11-03 22:09:02 +01:00
parent c8107012b5
commit 451e9e9b26
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/AABB_traversal_traits_with_Hausdorff_distance.h
View File

@ -207,26 +207,26 @@ namespace CGAL {
// Compute distance of the bounding boxes.
// Distance along the x-axis.
FT dist_x = FT(0);
if (tri_max.x() < bbox.min(0)) {
dist_x = bbox.min(0) - tri_max.x();
} else if (bbox.max(0) < tri_min.x()) {
dist_x = tri_min.x() - bbox.max(0);
if (tri_max.x() < (bbox.min)(0)) {
dist_x = (bbox.min)(0) - tri_max.x();
} else if ((bbox.max)(0) < tri_min.x()) {
dist_x = tri_min.x() - (bbox.max)(0);
}
// Distance along the y-axis.
FT dist_y = FT(0);
if (tri_max.y() < bbox.min(1)) {
dist_y = bbox.min(1) - tri_max.y();
} else if (bbox.max(1) < tri_min.y()) {
dist_y = tri_min.y() - bbox.max(1);
if (tri_max.y() < (bbox.min)(1)) {
dist_y = (bbox.min)(1) - tri_max.y();
} else if ((bbox.max)(1) < tri_min.y()) {
dist_y = tri_min.y() - (bbox.max)(1);
}
// Distance along the z-axis.
FT dist_z = FT(0);
if (tri_max.z() < bbox.min(2)) {
dist_z = bbox.min(2) - tri_max.z();
} else if (bbox.max(2) < tri_min.z()) {
dist_z = tri_min.z() - bbox.max(2);
if (tri_max.z() < (bbox.min)(2)) {
dist_z = (bbox.min)(2) - tri_max.z();
} else if ((bbox.max)(2) < tri_min.z()) {
dist_z = tri_min.z() - (bbox.max)(2);
}
// Lower bound on the distance between the two bounding boxes is given
@ -443,11 +443,11 @@ namespace CGAL {
// Shift the vector to be the difference between the farthest corner
// of the bounding box away from the closest point on TM2.
FT diff_x = (bbox.max(0) - bbox.min(0)) / FT(2);
FT diff_x = ((bbox.max)(0) - (bbox.min)(0)) / FT(2);
if (difference.x() < 0) diff_x = diff_x * -FT(1);
FT diff_y = (bbox.max(1) - bbox.min(1)) / FT(2);
FT diff_y = ((bbox.max)(1) - (bbox.min)(1)) / FT(2);
if (difference.y() < 0) diff_y = diff_y * -FT(1);
FT diff_z = (bbox.max(2) - bbox.min(2)) / FT(2);
FT diff_z = ((bbox.max)(2) - (bbox.min)(2)) / FT(2);
if (difference.z() < 0) diff_z = diff_z * -FT(1);
difference = difference + Vector_3(diff_x, diff_y, diff_z); // it is (9) in the paper