From db42b2116aad0680f53867a868f4d229d3e2ea5b Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Mon, 7 Aug 2023 15:23:12 -0600 Subject: [PATCH] use std::abs in remaining places that were using C abs() --- bsputil/bsputil.cc | 2 +- include/common/polylib.hh | 2 +- light/ltface.cc | 2 +- qbsp/brushbsp.cc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bsputil/bsputil.cc b/bsputil/bsputil.cc index db8e005c..d83204cb 100644 --- a/bsputil/bsputil.cc +++ b/bsputil/bsputil.cc @@ -277,7 +277,7 @@ static void CheckBSPFile(const mbsp_t *bsp) const int edgenum = bsp->dsurfedges[i]; if (!edgenum) fmt::print("warning: surfedge {} has zero value!\n", i); - if (abs(edgenum) >= bsp->dedges.size()) + if (std::abs(edgenum) >= bsp->dedges.size()) fmt::print("warning: surfedge {} is out of range (abs({}) >= {})\n", i, edgenum, bsp->dedges.size()); } diff --git a/include/common/polylib.hh b/include/common/polylib.hh index 51272dcf..feca0218 100644 --- a/include/common/polylib.hh +++ b/include/common/polylib.hh @@ -908,7 +908,7 @@ public: { vec_t max_dist = 0.0; for (size_t i = 0; i < size(); i++) { - vec_t dist = abs(plane.distance_to(at(i))); + vec_t dist = std::abs(plane.distance_to(at(i))); if (dist > max_dist) { max_dist = dist; } diff --git a/light/ltface.cc b/light/ltface.cc index 7fa8c424..510cf3ab 100644 --- a/light/ltface.cc +++ b/light/ltface.cc @@ -1877,7 +1877,7 @@ static void LightFace_PhongDebug(const mbsp_t *bsp, const lightsurf_t *lightsurf sample.color = lightsurf->samples[i].normal; for (auto &v : sample.color) { - v = abs(v) * 255; + v = std::abs(v) * 255; } } diff --git a/qbsp/brushbsp.cc b/qbsp/brushbsp.cc index 50f2836e..462a5bd8 100644 --- a/qbsp/brushbsp.cc +++ b/qbsp/brushbsp.cc @@ -1029,7 +1029,7 @@ static side_t *SelectSplitPlane( // give a value estimate for using this plane - int value = 5 * facing - 5 * splits - abs(front - back); + int value = 5 * facing - 5 * splits - std::abs(front - back); // value = -5*splits; // value = 5*facing - 5*splits; if (plane.get_type() < plane_type_t::PLANE_ANYX)