summaryrefslogtreecommitdiffstats
path: root/core/math/math_funcs.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-05-10 15:38:53 +0200
committerGitHub <noreply@github.com>2020-05-10 15:38:53 +0200
commit6ab92464bc6356f3342c3efd1fc1bb1a5e4467d5 (patch)
tree405a85e89e036e2240c74ee850121d912e21704b /core/math/math_funcs.h
parent54b20a25b90c8c8d8dfd7f68d66d0ec57c71435f (diff)
parent69de7ce38c40c57a1fabe12c9e5a3eab903a4035 (diff)
downloadredot-engine-6ab92464bc6356f3342c3efd1fc1bb1a5e4467d5.tar.gz
Merge pull request #38621 from akien-mga/stylé-comme-jamais
Style: clang-format: Disable if statements and case labels on single line
Diffstat (limited to 'core/math/math_funcs.h')
-rw-r--r--core/math/math_funcs.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h
index 3e1eb14a6a..bd13c82894 100644
--- a/core/math/math_funcs.h
+++ b/core/math/math_funcs.h
@@ -233,12 +233,14 @@ public:
static _ALWAYS_INLINE_ float range_lerp(float p_value, float p_istart, float p_istop, float p_ostart, float p_ostop) { return Math::lerp(p_ostart, p_ostop, Math::inverse_lerp(p_istart, p_istop, p_value)); }
static _ALWAYS_INLINE_ double smoothstep(double p_from, double p_to, double p_weight) {
- if (is_equal_approx(p_from, p_to)) return p_from;
+ if (is_equal_approx(p_from, p_to))
+ return p_from;
double x = CLAMP((p_weight - p_from) / (p_to - p_from), 0.0, 1.0);
return x * x * (3.0 - 2.0 * x);
}
static _ALWAYS_INLINE_ float smoothstep(float p_from, float p_to, float p_weight) {
- if (is_equal_approx(p_from, p_to)) return p_from;
+ if (is_equal_approx(p_from, p_to))
+ return p_from;
float x = CLAMP((p_weight - p_from) / (p_to - p_from), 0.0f, 1.0f);
return x * x * (3.0f - 2.0f * x);
}