JavaScript animation engine
Update staggering easing
Julian Garniere0b31cc55cfb
diff --git a/documentation/examples/anime-easings.html b/documentation/examples/anime-easings.htmlindex 7ad9f9c4..d3c916e0 100644--- a/documentation/examples/anime-easings.html+++ b/documentation/examples/anime-easings.html@@ -68,10 +68,10 @@scaleY: (() => {const keyframes = [];for (let ease in anime.penner) {- keyframes.push({value: anime.stagger([200, 1], {easing: ease}), easing: ease});+ keyframes.push({value: anime.stagger([1, 200], {easing: ease}), easing: ease});};- keyframes.push({ value: anime.stagger([200, 1], {easing: 'steps(10)'}), easing: 'steps(10)' });- keyframes.push({ value: anime.stagger([200, 1], {easing: 'cubicBezier(0.545, 0.475, 0.145, 1)'}) });+ keyframes.push({ value: anime.stagger([1, 200], {easing: 'steps(10)'}), easing: 'steps(10)' });+ keyframes.push({ value: anime.stagger([1, 200], {easing: 'cubicBezier(0.545, 0.475, 0.145, 1)'}) });keyframes.push({ value: 1 });return keyframes;})(),diff --git a/documentation/examples/anime-stagger-demo.html b/documentation/examples/anime-stagger-demo.htmlindex bcca5e8c..e01af377 100644--- a/documentation/examples/anime-stagger-demo.html+++ b/documentation/examples/anime-stagger-demo.html@@ -87,16 +87,16 @@delay: anime.stagger(1, {from: 'last'})}).add({- //rotate: anime.stagger(-1, {from: 'center', direction: 'reverse', easing: 'easeInSine'}),+ rotate: anime.stagger(2, {from: 'center', direction: 'reverse', easing: 'easeInSine'}),translateX: 0,translateY: 0,- delay: anime.stagger(20, {from: 'center'})+ delay: anime.stagger(10, {from: 'center'})}).add({translateX: anime.stagger([-300, 400]),translateY: anime.stagger([-80, 80], {from: 'center', easing: 'easeOutSine'}),- rotate: anime.stagger([45, -45], {from: 'center'}),- delay: anime.stagger(25, {from: 'center', direction: 'reverse', easing: 'easeInSine'}),+ //rotate: anime.stagger([45, -45], {from: 'center'}),+ delay: anime.stagger(10, {from: 'last', direction: 'reverse', easing: 'easeInSine'}),}).add({translateX: () => anime.random(-100, 100),@@ -126,7 +126,7 @@.add({translateX: anime.stagger([25, -25], {from: 'first'}),translateY: 0,- rotate: anime.stagger([45, -45], {from: 'first'}),+ rotate: anime.stagger([40, -40], {from: 'first'}),delay: anime.stagger(10, {from: 'first'}),}).add({diff --git a/documentation/examples/anime-stagger-tests.html b/documentation/examples/anime-stagger-tests.htmlindex 64f51a8f..76fffcce 100644--- a/documentation/examples/anime-stagger-tests.html+++ b/documentation/examples/anime-stagger-tests.html@@ -333,13 +333,13 @@}, 0).add({targets: '.easing div',- translateY: anime.stagger(['2em', '-2em'], {easing: 'easeOutExpo'}),- delay: anime.stagger([0, 600], {easing: 'easeOutExpo'})+ translateY: anime.stagger('-.5em', {from: 0, easing: 'easeOutExpo'}),+ delay: anime.stagger([0, 600], {from: 0, easing: 'easeOutExpo'})}, 0).add({targets: '.easing-reversed div',- translateY: anime.stagger(['2em', '-2em'], { direction: 'reverse', easing: 'easeOutExpo'}),- delay: anime.stagger([0, 600], { direction: 'reverse', easing: 'easeOutExpo'}),+ translateY: anime.stagger('-.5em', {from: 0, direction: 'reverse', easing: 'easeOutExpo'}),+ delay: anime.stagger([0, 600], {from: 0, direction: 'reverse', easing: 'easeOutExpo'}),}, 0).add({targets: '.grid div',@@ -353,15 +353,15 @@}, 0).add({targets: '.grid-axis div',- translateX: anime.stagger('.5rem', {grid: [10, 5], from: 'center', axis: 'x'}),- translateY: anime.stagger('.5rem', {grid: [10, 5], from: 'center', axis: 'y'}),- delay: anime.stagger(100, {grid: [10, 5], from: 'center'})+ translateX: anime.stagger('.5rem', {grid: [10, 5], from: 38, axis: 'x'}),+ translateY: anime.stagger('.5rem', {grid: [10, 5], from: 38, axis: 'y'}),+ delay: anime.stagger(100, {grid: [10, 5], from: 38})}, 0).add({targets: '.grid-axis-reversed div',- translateX: anime.stagger('.5rem', {grid: [10, 5], from: 'center', axis: 'x', direction: 'reverse'}),- translateY: anime.stagger('.5rem', {grid: [10, 5], from: 'center', axis: 'y', direction: 'reverse'}),- delay: anime.stagger(100, {grid: [10, 5], from: 'center', direction: 'reverse'})+ translateX: anime.stagger('.5rem', {grid: [10, 5], from: 38, axis: 'x', direction: 'reverse'}),+ translateY: anime.stagger('.5rem', {grid: [10, 5], from: 38, axis: 'y', direction: 'reverse'}),+ delay: anime.stagger(100, {grid: [10, 5], from: 38, direction: 'reverse'})}, 0);function animePlayer(instance, playerClass) {diff --git a/src/index.js b/src/index.jsindex 84033b94..945804c0 100644--- a/src/index.js+++ b/src/index.js@@ -1188,7 +1188,6 @@ function stagger(val, params = {}) {const val2 = isRange ? parseFloat(val[1]) : 0;const unit = getUnit(isRange ? val[1] : val) || 0;const start = params.start || 0 + (isRange ? val1 : 0);- const reverseValue = val => axis ? (val < 0) ? val * -1 : -val : Math.abs(maxValue - val);let values = [];let maxValue = 0;return (el, i, t) => {@@ -1204,23 +1203,20 @@ function stagger(val, params = {}) {const fromY = !fromCenter ? Math.floor(fromIndex/grid[0]) : (grid[1]-1)/2;const toX = index%grid[0];const toY = Math.floor(index/grid[0]);- const dx = fromX - toX;- const dy = fromY - toY;- let value = Math.sqrt(dx * dx + dy * dy);- if (axis === 'x') value = -dx;- if (axis === 'y') value = -dy;+ const distanceX = fromX - toX;+ const distanceY = fromY - toY;+ let value = Math.sqrt(distanceX * distanceX + distanceY * distanceY);+ if (axis === 'x') value = -distanceX;+ if (axis === 'y') value = -distanceY;values.push(value);}maxValue = Math.max(...values);}- if (direction === 'reverse') {- values = values.map(reverseValue);- }+ if (easing) values = values.map(val => easing(val / maxValue) * maxValue);+ if (direction === 'reverse') values = values.map(val => axis ? (val < 0) ? val * -1 : -val : Math.abs(maxValue - val));}- let progress = values[i];- if (easing) progress = easing(progress / maxValue) * maxValue;const spacing = isRange ? (val2 - val1) / maxValue : val1;- return start + (spacing * (Math.round(progress * 10) / 10)) + unit;+ return start + (spacing * (Math.round(values[i] * 100) / 100)) + unit;}}