From 1a68039fcfbc457bb997737cdf326f3e06c7b56c Mon Sep 17 00:00:00 2001 From: Yuri Rubinsky Date: Wed, 8 Jun 2022 16:55:31 +0300 Subject: [PATCH] Fix `wrapf` to correct wrap values with 0.1 stepping (cherry picked from commit 09418afbc0b5a5642448786751b590352ee6cf97) --- core/math/math_funcs.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index dc49109c2..ea1179419 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -313,11 +313,19 @@ public: } static _ALWAYS_INLINE_ double wrapf(double value, double min, double max) { double range = max - min; - return is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range)); + double result = is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range)); + if (is_equal_approx(result, max)) { + return min; + } + return result; } static _ALWAYS_INLINE_ float wrapf(float value, float min, float max) { float range = max - min; - return is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range)); + float result = is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range)); + if (is_equal_approx(result, max)) { + return min; + } + return result; } // double only, as these functions are mainly used by the editor and not performance-critical,