JavaScript animation engine
Timeline refactoring (WIP)
Julian Garnier4dcacd63f6ef
diff --git a/anime.js b/anime.jsindex ab94c889..1268a990 100644--- a/anime.js+++ b/anime.js@@ -540,7 +540,8 @@prop = {value: prop};}}- return toArray(prop).map((v, i) => {+ const propArray = is.arr(prop) ? prop : [prop];+ return propArray.map((v, i) => {// Default delay value should be applied only on the first tweenconst delay = !i ? tweenSettings.delay : 0;// Use path object as a tween value@@ -618,12 +619,15 @@attribute: (t, p, v) => t.setAttribute(p, v),object: (t, p, v) => t[p] = v,transform: (t, p, v, transforms, reversed, manual) => {- const closing = reversed ? transforms.first : transforms.last;transforms.list.set(p, v);- if (closing === p || manual) {- let str = ''; for (let [prop, value] of transforms.list) str += `${prop}(${value}) `;+ if (p === transforms.last || manual) {+ let str = '';+ for (let [prop, value] of transforms.list) {+ str += `${prop}(${value}) `;+ }t.style.transform = str;}+ console.log(transforms.list);}}@@ -753,14 +757,19 @@return instance.reversed ? instance.duration - time : time;}- function syncInstanceChildren(time) {+ function syncInstanceChildren(time, manual) {const children = instance.children;const childrenLength = children.length;- if (time >= instance.currentTime) {+ if (!manual) {for (let i = 0; i < childrenLength; i++) children[i].seek(time);} else {- for (let i = childrenLength; i--;) children[i].seek(time);+ if (time >= instance.currentTime) {+ for (let i = 0; i < childrenLength; i++) children[i].seek(time);+ } else {+ for (let i = childrenLength; i--;) children[i].seek(time);+ }}+}function setAnimationsProgress(insTime) {@@ -835,14 +844,15 @@}}- function setInstanceProgress(engineTime) {+ function setInstanceProgress(engineTime, manual) {const insDuration = instance.duration;const insOffset = instance.timeOffset;const insStart = insOffset + instance.delay;const insCurrentTime = instance.currentTime;const insReversed = instance.reversed;const insTime = adjustTime(engineTime);- if (instance.children.length) syncInstanceChildren(insTime);+ // instance.reversed = insTime < insCurrentTime;+ if (instance.children.length) syncInstanceChildren(insTime, manual);if (insTime >= insStart || !insDuration) {if (!instance.began) {instance.began = true;@@ -906,10 +916,11 @@}instance.seek = function(time) {- setInstanceProgress(adjustTime(time));+ setInstanceProgress(adjustTime(time), true);}instance.pause = function() {+ instance.paused = true;const i = activeInstances.indexOf(instance);if (i > -1) activeInstances.splice(i, 1);}@@ -982,6 +993,23 @@ins.began = true;ins.completed = true;if (ins.duration > tlDuration) tl.duration = ins.duration;+ // ins.animatables.forEach(newAnimatable => {+ // const newTransforms = newAnimatable.transforms;+ // tl.children.forEach(child => {+ // child.animatables.forEach(animatable => {+ // if (animatable.target === newAnimatable.target) {+ // childTransforms = animatable.transforms;+ // for (let [prop, value] of newTransforms.list) {+ // if (!childTransforms.list.get(prop)) {+ // childTransforms.list.set(prop, value);+ // childTransforms['manual'] = true;+ // }+ // }+ // }+ // });+ // });+ // });+ console.log(ins.animations);tl.children.push(ins);tl.seek(0);tl.reset();diff --git a/documentation/examples/anime-DOM-stress-test.html b/documentation/examples/anime-DOM-stress-test.htmlindex 24c6de16..04351595 100644--- a/documentation/examples/anime-DOM-stress-test.html+++ b/documentation/examples/anime-DOM-stress-test.html@@ -46,7 +46,7 @@<script>const wrapperEl = document.body;- const numberOfEls = 1000;+ const numberOfEls = 500;const duration = 2000;const delay = duration / numberOfEls;const radius = window.innerWidth < window.innerHeight ? window.innerWidth : window.innerHeight;diff --git a/documentation/examples/anime-logo-animation.html b/documentation/examples/anime-logo-animation.htmlindex 8d179738..51a785e0 100644--- a/documentation/examples/anime-logo-animation.html+++ b/documentation/examples/anime-logo-animation.html@@ -225,9 +225,8 @@{ value: 0, duration: 20, delay: 500, easing: 'easeInQuart' },{ value: 1, duration: 200, delay: 1000, easing: 'easeOutQuart' },{ value: 0, duration: 400, delay: 500, easing: 'easeInBack' }- ],- offset: 0- })+ ]+ }, 0).add({targets: '.dot-i',translateY: { value: [-200, 0], duration: 500, elasticity: 400 },@@ -235,9 +234,8 @@{ value: [0, 1], duration: 100, easing: 'easeOutQuart' },{ value: 0, duration: 400, delay: 1400, easing: 'easeInBack' }],- delay: 1200,- offset: 0- })+ delay: 1200+ }, 0).add({targets: '.fill.in',strokeDashoffset: {@@ -247,7 +245,7 @@easing: 'easeOutQuart'},stroke: {- value: ['#FFF', function(el) { return anime.getValue(el.parentNode, 'stroke') } ],+ value: ['#FFF', function(el) { return anime.get(el.parentNode, 'stroke') } ],duration: 500,delay: 500,easing: 'easeInQuad'@@ -256,9 +254,8 @@value: 0,duration: 1,delay: function(el, i, t) { return 1900 + ( i * 80 ); },- },- offset: 0- })+ }+ }, 0).add({targets: '.fill.out',strokeDashoffset: [@@ -269,9 +266,8 @@delay: function(el, i) { return (i * 80); },easing: 'easeInQuart'}- ],- offset: 0- })+ ]+ }, 0).add({targets: '.line.out',strokeDashoffset: {@@ -285,16 +281,14 @@delay: function(el, i, t) { return 2000 + ( i * 100 ); },duration: 200,easing: 'linear'- },- offset: 0- })+ }+ }, 0).add({targets: '.icon',opacity: { value: 1, duration: 10, delay: 2800, easing: 'linear' },translateY: { value: 60, duration: 800 },- delay: 4200,- offset: 0- })+ delay: 4200+ }, 0).add({targets: '.icon-line',strokeDashoffset: [@@ -308,20 +302,18 @@easing: 'easeInQuad'},stroke: {- value: ['#FFF', function(el) { return anime.getValue(el, 'stroke') } ],+ value: ['#FFF', function(el) { return anime.get(el, 'stroke') } ],duration: 800,delay: 3400,easing: 'easeInQuad'- },- offset: 0- })+ }+ }, 0).add({targets: ['.icon-text path', '.icon-text polygon'],translateY: [50, 0],opacity: { value: [0, 1], duration: 100, easing: 'linear' },- delay: function(el, i, t) { return 4200 + ( i * 20 ); },- offset: 0- })+ delay: function(el, i, t) { return 4200 + ( i * 20 ); }+ }, 0)function init() {document.body.classList.add('ready');diff --git a/documentation/examples/anime-speed-test.html b/documentation/examples/anime-speed-test.htmlindex cb401542..7a4c10da 100644--- a/documentation/examples/anime-speed-test.html+++ b/documentation/examples/anime-speed-test.html@@ -54,7 +54,7 @@for (var i = 0; i < numberOfEls; i++) {var hue = 180 + Math.round(90 / numberOfEls * i);- var angle = anime.random(0, 360);+ var angle = anime.random(-360, 360);var el = document.createElement('div');el.classList.add('particule');el.style.backgroundColor = 'hsl(' + hue + ', 100%, 40%)';diff --git a/documentation/examples/anime-timeline.html b/documentation/examples/anime-timeline.htmlindex e1946e3b..25df225c 100644--- a/documentation/examples/anime-timeline.html+++ b/documentation/examples/anime-timeline.html@@ -17,7 +17,7 @@<link rel="icon" type="image/png" href="../assets/img/icons/favicon.png" ><link href="../assets/css/anime.css" rel="stylesheet"><script src="../../anime.js"></script>- <!-- <script src="../assets/js/anime.2.0.1.js"></script> -->+ <!-- <script src="../assets/js/anime.2.2.0.js"></script> --><style>body {@@ -92,7 +92,7 @@<script>var noOffset = anime.timeline({- autoplay: true+ autoplay: false});noOffset@@ -144,7 +144,7 @@});var relativeOffset = anime.timeline({- autoplay: true+ autoplay: false});relativeOffset@@ -190,7 +190,7 @@});var absoluteOffset = anime.timeline({- autoplay: true+ autoplay: false});absoluteOffset@@ -200,16 +200,14 @@translateY: -100,scale: 2,background: '#FF1461',- offset: 0- })+ }, 0).add({targets: '.absolute-offset',translateX: -100,translateY: 100,scale: 3,background: '#18FF92',- offset: 1000- })+ }, 1000).add({targets: '.absolute-offset',translateX: 100,@@ -217,24 +215,21 @@rotate: 120,scale: 4,background: '#5A87FF',- offset: 2000- })+ }, 2000).add({targets: '.absolute-offset',translateX: 100,translateY: -100,scale: 5,background: '#FBF38C',- offset: 3000- })+ }, 3000).add({targets: '.absolute-offset',translateX: 100,translateY: -100,scale: '+=8',background: '#FBF38C',- offset: 4000- });+ }), 4000;var controlsProgressEl = document.querySelector('.controls .progress');@@ -258,7 +253,7 @@multipleTargets.add({- targets: '.multiple-targets-01',+ targets: ['.multiple-targets-01', '.multiple-targets-02', '.multiple-targets-03', '.multiple-targets-04'],translateY: -100,scale: 8,background: '#FF1461',@@ -267,32 +262,32 @@complete: function() { console.log('multipleTargets animation 1 completed')}}).add({- targets: '.multiple-targets-02',+ targets: ['.multiple-targets-01', '.multiple-targets-02', '.multiple-targets-03', '.multiple-targets-04'],translateY: -100,scale: 8,background: '#18FF92',duration: 500,begin: function() { console.log('multipleTargets animation 2 began')},complete: function() { console.log('multipleTargets animation 2 completed')}- })+ }, '-=250').add({- targets: '.multiple-targets-03',+ targets: ['.multiple-targets-01', '.multiple-targets-02', '.multiple-targets-03', '.multiple-targets-04'],translateY: -100,scale: 8,background: '#5A87FF',duration: 500,begin: function() { console.log('multipleTargets animation 3 began')},complete: function() { console.log('multipleTargets animation 3 completed')}- })+ }, '-=250').add({- targets: '.multiple-targets-04',+ targets: ['.multiple-targets-01', '.multiple-targets-02', '.multiple-targets-03', '.multiple-targets-04'],translateY: -100,scale: 8,background: '#FBF38C',duration: 500,begin: function() { console.log('multipleTargets animation 4 began')},complete: function() { console.log('multipleTargets animation 4 completed')}- })+ }, '-=250').add({targets: ['.multiple-targets-01', '.multiple-targets-02', '.multiple-targets-03', '.multiple-targets-04'],translateY: -100,@@ -301,12 +296,12 @@duration: 1000,begin: function() { console.log('multipleTargets animation 5 began')},complete: function() { console.log('multipleTargets animation 5 completed')}- });+ }, '-=250');controlsProgressEl.addEventListener('input', function() {multipleTargets.seek(multipleTargets.duration * (controlsProgressEl.value / 100));});</script>- <script src="../assets/js/stats.js"></script>+ <!-- <script src="../assets/js/stats.js"></script> --></html>