diff options
| author | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-05-09 13:09:20 -0300 |
| commit | 1fd1b7a91b2f60a2841b9684e1e41728275cedaf (patch) | |
| tree | 17678512dde4890e941c78ba90ba23b184e2ae9a /scene/animation/tween_interpolaters.cpp | |
| parent | 1a7d370fcf7382a9e248925a7eef12d28e0bb9e3 (diff) | |
| parent | 158785636c809d5ebdb6995a088c7776ce45e65c (diff) | |
| download | godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.gz godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.tar.zst godot-1fd1b7a91b2f60a2841b9684e1e41728275cedaf.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/animation/tween_interpolaters.cpp')
| -rw-r--r-- | scene/animation/tween_interpolaters.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/animation/tween_interpolaters.cpp b/scene/animation/tween_interpolaters.cpp index c052d752f..9128d220d 100644 --- a/scene/animation/tween_interpolaters.cpp +++ b/scene/animation/tween_interpolaters.cpp @@ -285,18 +285,18 @@ namespace cubic { namespace circ { static real_t in(real_t t, real_t b, real_t c, real_t d) { - return -c * (sqrt(1 - (t /= d) * t) - 1) + b; + return -c * (sqrt(1 - (t /= d) * t) - 1) + b; // TODO: ehrich: operation with t is undefined } static real_t out(real_t t, real_t b, real_t c, real_t d) { - return c * sqrt(1 - (t = t / d - 1) * t) + b; + return c * sqrt(1 - (t = t / d - 1) * t) + b; // TODO: ehrich: operation with t is undefined } static real_t in_out(real_t t, real_t b, real_t c, real_t d) { if ((t /= d / 2) < 1) return -c / 2 * (sqrt(1 - t * t) - 1) + b; - return c / 2 * (sqrt(1 - t * (t -= 2)) + 1) + b; + return c / 2 * (sqrt(1 - t * (t -= 2)) + 1) + b; // TODO: ehrich: operation with t is undefined } static real_t out_in(real_t t, real_t b, real_t c, real_t d) @@ -364,15 +364,15 @@ namespace back { static real_t out(real_t t, real_t b, real_t c, real_t d) { float s = 1.70158f; - return c * ((t = t / d- 1) * t * ((s + 1) * t + s) + 1) + b; + return c * ((t = t / d- 1) * t * ((s + 1) * t + s) + 1) + b; // TODO: ehrich: operation with t is undefined } static real_t in_out(real_t t, real_t b, real_t c, real_t d) { float s = 1.70158f; - if ((t /= d / 2) < 1) return c / 2 * (t * t * (((s *= (1.525f)) + 1) * t - s)) + b; + if ((t /= d / 2) < 1) return c / 2 * (t * t * (((s *= (1.525f)) + 1) * t - s)) + b; // TODO: ehrich: operation with s is undefined float postFix = t -= 2; - return c / 2 * ((postFix) * t * (((s *= (1.525f)) + 1) * t + s) + 2) + b; + return c / 2 * ((postFix) * t * (((s *= (1.525f)) + 1) * t + s) + 2) + b; // TODO: ehrich: operation with s is undefined } static real_t out_in(real_t t, real_t b, real_t c, real_t d) |