Skip to content

armgit / anime

Public Imported from GitHub
0

JavaScript animation engine

Easing optimisation / cleanup

Julian Garnier83ec02ee7027
diff --git a/anime.js b/anime.js
index c771547a..60b8df7c 100644
--- a/anime.js
+++ b/anime.js
@@ -73,11 +73,13 @@
function parseEasingParameters(string) {
const match = /\(([^)]+)\)/.exec(string);
- if (match) return match[1].split(',').map(p=> parseFloat(p));
+ return match ? match[1].split(',').map(p=> parseFloat(p)) : [];
}
// Spring solver inspired by Webkit Copyright © 2016 Apple Inc. All rights reserved. https://webkit.org/demos/spring/spring.js
+ const springCache = {};
+
function spring(string, duration) {
const [mass = 1, stiffness = 100, damping = 10, velocity = 0] = parseEasingParameters(string);
@@ -99,6 +101,7 @@
}
function getDuration() {
+ if (springCache[string]) return springCache[string];
const frame = 1/6;
let elapsed = 0;
let rest = 0;
@@ -111,7 +114,8 @@
rest = 0;
}
}
- return elapsed * frame * 1000;
+ springCache[string] = elapsed * frame * 1000;
+ return springCache[string];
}
return duration ? solver : getDuration;
@@ -123,9 +127,8 @@
function elastic(amplitude = 1, period = .5) {
return t => {
const a = Math.max(amplitude, 1);
- const p = period;
return (t === 0 || t === 1) ? t :
- -a * Math.pow(2, 10 * (t - 1)) * Math.sin((((t - 1) - (p / (2 * Math.PI) * Math.asin(1 / a))) * (Math.PI * 2)) / p);
+ -a * Math.pow(2, 10 * (t - 1)) * Math.sin((((t - 1) - (period / (2 * Math.PI) * Math.asin(1 / a))) * (Math.PI * 2)) / period);
}
}
@@ -259,11 +262,7 @@
}
let eases = {
- linear: [0.250, 0.250, 0.750, 0.750],
- ease: [0.250, 0.100, 0.250, 1.000],
- in: [0.420, 0.000, 1.000, 1.000],
- out: [0.000, 0.000, 0.580, 1.000],
- inOut: [0.420, 0.000, 0.580, 1.000]
+ linear: [0.250, 0.250, 0.750, 0.750]
}
for (let equation in penner) {
diff --git a/documentation/examples/anime-easings.html b/documentation/examples/anime-easings.html
index 6ee7de3e..900d7c45 100644
--- a/documentation/examples/anime-easings.html
+++ b/documentation/examples/anime-easings.html
@@ -80,19 +80,19 @@
})
var anim02 = anime({
targets: '.color-01',
- translateX: 1000,
- easing: 'cubicBezier(0, -.55, .0, 1.55)'
+ translateX: 10000,
+ easing: 'outElastic(2, .1)'
})
var anim02 = anime({
targets: '.color-02',
translateX: 1000,
- easing: 'spring(1, 100, 10, 0)'
+ easing: 'spring(100, 100, 1, 0)'
})
var anim03 = anime({
targets: '.color-03',
translateX: 1000,
duration: 5000,
- easing: 'outElastic(2, .1)'
+ easing: 'cubicBezier(0, -.55, .0, 1.55)'
})
// console.log(anim01);
// anime({
diff --git a/documentation/examples/anime-infinite-animation.html b/documentation/examples/anime-infinite-animation.html
index 0b92f076..2677a8d8 100644
--- a/documentation/examples/anime-infinite-animation.html
+++ b/documentation/examples/anime-infinite-animation.html
@@ -51,7 +51,7 @@
var rows = 10;
var numberOfEls = rows * rows;
var duration = 1000;
- var stagger = 10;
+ var stagger = 6;
var midScreenX = window.innerWidth / 2;
var midScreenY = window.innerHeight / 2;
var radius = Math.sqrt(midScreenX * midScreenX + midScreenY * midScreenY);
@@ -69,13 +69,13 @@
var anim = anime({
targets: el,
- translateY: '1em',
- scale: [.5, .1],
+ translateY: '2em',
+ scale: [.9, .1],
direction: 'alternate',
loop: true,
- easing: 'inOutSine',
+ easing: 'spring(100, 100, 1, 0)',
duration: duration,
- startTime: -((i + 1) * stagger)
+ startTime: ((numberOfEls + 1 - (i)) * stagger)
});
fragment.appendChild(el);
diff --git a/documentation/examples/anime-mgs-logo-animation.html b/documentation/examples/anime-mgs-logo-animation.html
index ad7b5491..e665bb86 100644
--- a/documentation/examples/anime-mgs-logo-animation.html
+++ b/documentation/examples/anime-mgs-logo-animation.html
@@ -186,7 +186,7 @@
fill: '#F9C100',
delay: (el, i) => 2200 + (i * 75),
duration: 400,
- easing: 'easeOutExpo',
+ easing: 'outExpo',
}, 0)
.add({
targets: '.katakana path',
@@ -198,13 +198,13 @@
fill: '#F9C100',
delay: (el, i) => 2400 + (i * 120),
duration: 1200,
- easing: 'easeOutCirc',
+ easing: 'outCirc',
}, 0)
.add({
targets: '.text-fills path',
opacity: [0, 1],
fill: '#F9C100',
- easing: 'easeOutExpo',
+ easing: 'outExpo',
duration: 200,
delay: (t, i) => 3300 + (anime.random(0, 450)),
}, 0)
@@ -236,7 +236,7 @@
},
delay: (t, i) => (i * 25),
duration: 500,
- easing: 'easeOutQuart',
+ easing: 'outQuart',
}, 0);
</script>