diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2021-06-20 00:35:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-20 00:35:28 +0200 |
commit | 9c182b0f45df0f1a134f047899cdd9291c34f58a (patch) | |
tree | 6735c004f29713e1dde829ee03f7373c6b1e8db8 /thirdparty/misc/easing_equations.cpp | |
parent | bbf6d645fb324ce73cb3a0141dc508a83f66bd00 (diff) | |
parent | 900b2e0fdcc12d28a744ae36004b9b2dc7f196d1 (diff) |
Merge pull request #41794 from KoBeWi/shiny_new_tweens
Diffstat (limited to 'thirdparty/misc/easing_equations.cpp')
-rw-r--r-- | thirdparty/misc/easing_equations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/thirdparty/misc/easing_equations.cpp b/thirdparty/misc/easing_equations.cpp index af48aaf079..ce32c1a362 100644 --- a/thirdparty/misc/easing_equations.cpp +++ b/thirdparty/misc/easing_equations.cpp @@ -297,7 +297,7 @@ static real_t out_in(real_t t, real_t b, real_t c, real_t d) { } }; // namespace back -Tween::interpolater Tween::interpolaters[Tween::TRANS_COUNT][Tween::EASE_COUNT] = { +Tween::interpolater Tween::interpolaters[Tween::TRANS_MAX][Tween::EASE_MAX] = { { &linear::in, &linear::out, &linear::in_out, &linear::out_in }, { &sine::in, &sine::out, &sine::in_out, &sine::out_in }, { &quint::in, &quint::out, &quint::in_out, &quint::out_in }, @@ -311,7 +311,7 @@ Tween::interpolater Tween::interpolaters[Tween::TRANS_COUNT][Tween::EASE_COUNT] { &back::in, &back::out, &back::in_out, &back::out_in }, }; -real_t Tween::_run_equation(TransitionType p_trans_type, EaseType p_ease_type, real_t t, real_t b, real_t c, real_t d) { +real_t Tween::run_equation(TransitionType p_trans_type, EaseType p_ease_type, real_t t, real_t b, real_t c, real_t d) { interpolater cb = interpolaters[p_trans_type][p_ease_type]; ERR_FAIL_COND_V(cb == NULL, b); |