From 6883325f926af425cf1db7606506f5538b7a205a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sun, 1 May 2016 11:37:46 +0200 Subject: [PATCH] math: Fix rounding error for 0 in Math::round (#4495) Thus revert the previous workaround in commit b123bc4a2a9c07fcfd27a84109960bda158b3b9d. Fixes #3221. --- core/math/math_funcs.cpp | 4 +++- scene/gui/range.cpp | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 07f114725d9..0fbd0312142 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -135,18 +135,20 @@ double Math::rad2deg(double p_y) { double Math::round(double p_val) { - if (p_val>0) { + if (p_val>=0) { return ::floor(p_val+0.5); } else { p_val=-p_val; return -::floor(p_val+0.5); } } + double Math::asin(double p_x) { return ::asin(p_x); } + double Math::acos(double p_x) { return ::acos(p_x); diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index b00fcfe42c6..e056c55f718 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -78,10 +78,6 @@ void Range::set_val(double p_val) { if (p_valmin) p_val=shared->min; - //avoid to set -0 - if (p_val == 0) - p_val = 0; - if (shared->val==p_val) return;