Skip to content

armgit / anime

Public Imported from GitHub
0

JavaScript animation engine

Improve TL timings and loops

Julian Garnier495f2e25bae2
diff --git a/anime.js b/anime.js
index affd65ec..5415ab07 100644
--- a/anime.js
+++ b/anime.js
@@ -639,9 +639,14 @@
// Create Instance
- function getInstanceTimings(type, animations, tweenSettings) {
- const math = (type === 'delay') ? Math.min : Math.max;
- return animations.length ? math.apply(Math, animations.map(anim => anim[type])) : tweenSettings[type];
+ function getInstanceTimings(type, animations, instanceSettings, tweenSettings) {
+ const isDelay = (type === 'delay');
+ const math = isDelay ? Math.min : Math.max;
+ if (animations.length) {
+ return math.apply(Math, animations.map(anim => anim[type]));
+ } else {
+ return isDelay ? tweenSettings.delay : instanceSettings.offset + tweenSettings.delay + tweenSettings.duration;
+ }
}
function createNewInstance(params) {
@@ -654,8 +659,8 @@
children: [],
animatables: animatables,
animations: animations,
- duration: getInstanceTimings('duration', animations, tweenSettings),
- delay: getInstanceTimings('delay', animations, tweenSettings)
+ duration: getInstanceTimings('duration', animations, instanceSettings, tweenSettings),
+ delay: getInstanceTimings('delay', animations, instanceSettings, tweenSettings)
});
}
@@ -765,23 +770,22 @@
function setInstanceProgress(engineTime) {
const insDuration = instance.duration;
- const insOffset = instance.offset;
- const insDelay = instance.delay;
+ const insStart = instance.offset + instance.delay;
const insCurrentTime = instance.currentTime;
const insReversed = instance.reversed;
const insTime = adjustTime(engineTime);
if (instance.children.length) syncInstanceChildren(insTime);
- if (insTime >= insDelay) {
+ if (insTime >= insStart) {
setCallback('run');
if (!instance.began) {
instance.began = true;
setCallback('begin');
}
}
- if (insTime > insOffset && insTime < insDuration) {
+ if (insTime > insStart && insTime < insDuration) {
setAnimationsProgress(insTime);
} else {
- if (insTime <= insOffset && insCurrentTime !== 0) {
+ if (insTime <= insStart && insCurrentTime !== 0) {
setAnimationsProgress(0);
if (insReversed) countIteration();
}
@@ -904,6 +908,7 @@
const tlDuration = tl.duration;
const insOffset = insParams.offset;
insParams.autoplay = false;
+ insParams.direction = tl.direction;
insParams.offset = is.und(insOffset) ? tlDuration : getRelativeValue(insOffset, tlDuration);
tl.began = true;
tl.completed = true;
diff --git a/documentation/examples/anime-timeline.html b/documentation/examples/anime-timeline.html
index 31cfd325..e1946e3b 100644
--- a/documentation/examples/anime-timeline.html
+++ b/documentation/examples/anime-timeline.html
@@ -245,7 +245,7 @@
controlsProgressEl.value = anim.progress;
},
begin: function(anim) {
- console.trace('multiple begin');
+ console.log('multiple begin');
},
complete: function(anim) {
console.log('multiple complete');