Commit b9629155 authored by Viktor Lidholt's avatar Viktor Lidholt

Minor fixes to new animation curves

parent 9cb2cdac
...@@ -81,8 +81,7 @@ class Cubic implements Curve { ...@@ -81,8 +81,7 @@ class Cubic implements Curve {
} }
} }
double _bounce(double t) double _bounce(double t) {
{
if (t < 1.0 / 2.75) { if (t < 1.0 / 2.75) {
return 7.5625 * t * t; return 7.5625 * t * t;
} else if (t < 2 / 2.75) { } else if (t < 2 / 2.75) {
...@@ -149,9 +148,8 @@ class ElasticInOutCurve implements Curve { ...@@ -149,9 +148,8 @@ class ElasticInOutCurve implements Curve {
final double period; final double period;
double transform(double t) { double transform(double t) {
t = t * 2;
double s = period / 4.0; double s = period / 4.0;
t = t - 1.0; t = 2.0 * t - 1.0;
if (t < 0.0) if (t < 0.0)
return -0.5 * math.pow(2.0, 10.0 * t) * math.sin((t - s) * (math.PI * 2.0) / period); return -0.5 * math.pow(2.0, 10.0 * t) * math.sin((t - s) * (math.PI * 2.0) / period);
else else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment