summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2021-10-11 19:27:50 -0300
committerGitHub <noreply@github.com>2021-10-11 19:27:50 -0300
commit610de0974db4feb7e50c9349a8a164b6bf0f36c8 (patch)
tree9d5b542652e576f865abf0c97a37ee272210ae2e /core
parent9ed4f8367b29204b89f9feaf86727b24396fb180 (diff)
Revert "Implement reverse playback and ping-pong loop in AnimationPlayer and NodeAnimation"
Diffstat (limited to 'core')
-rw-r--r--core/math/math_funcs.h13
-rw-r--r--core/variant/variant_utility.cpp5
2 files changed, 0 insertions, 18 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h
index 5824d194a6..4e4f566517 100644
--- a/core/math/math_funcs.h
+++ b/core/math/math_funcs.h
@@ -291,19 +291,6 @@ public:
return is_zero_approx(range) ? min : value - (range * Math::floor((value - min) / range));
}
- static _ALWAYS_INLINE_ float fract(float value) {
- return value - floor(value);
- }
- static _ALWAYS_INLINE_ double fract(double value) {
- return value - floor(value);
- }
- static _ALWAYS_INLINE_ float pingpong(float value, float length) {
- return (length != 0.0f) ? abs(fract((value - length) / (length * 2.0f)) * length * 2.0f - length) : 0.0f;
- }
- static _ALWAYS_INLINE_ double pingpong(double value, double length) {
- return (length != 0.0) ? abs(fract((value - length) / (length * 2.0)) * length * 2.0 - length) : 0.0;
- }
-
// double only, as these functions are mainly used by the editor and not performance-critical,
static double ease(double p_x, double p_c);
static int step_decimals(double p_step);
diff --git a/core/variant/variant_utility.cpp b/core/variant/variant_utility.cpp
index e89bdd4faa..666b582e39 100644
--- a/core/variant/variant_utility.cpp
+++ b/core/variant/variant_utility.cpp
@@ -275,10 +275,6 @@ struct VariantUtilityFunctions {
return Math::wrapf(value, min, max);
}
- static inline double pingpong(double value, double length) {
- return Math::pingpong(value, length);
- }
-
static inline Variant max(const Variant **p_args, int p_argcount, Callable::CallError &r_error) {
if (p_argcount < 2) {
r_error.error = Callable::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
@@ -1230,7 +1226,6 @@ void Variant::_register_variant_utility_functions() {
FUNCBINDR(clampf, sarray("value", "min", "max"), Variant::UTILITY_FUNC_TYPE_MATH);
FUNCBINDR(nearest_po2, sarray("value"), Variant::UTILITY_FUNC_TYPE_MATH);
- FUNCBINDR(pingpong, sarray("value", "length"), Variant::UTILITY_FUNC_TYPE_MATH);
// Random