From de877acdb34a5e07ce6b7b9d21b9ca720181594d Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Mon, 28 Jan 2019 20:24:42 +0100 Subject: transitions --- client/util/vendor/oktween.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'client/util') diff --git a/client/util/vendor/oktween.js b/client/util/vendor/oktween.js index cbf5d835..2d787db2 100644 --- a/client/util/vendor/oktween.js +++ b/client/util/vendor/oktween.js @@ -73,11 +73,15 @@ oktween.update = (t) => { if (tween.units) val = (Math.round(val)) + tween.units tween.obj[prop] = val }) - tween.update && tween.update(tween.obj, dt) - if (dt == 1) { - tween.finished && tween.finished(tween) + if (tween.update) { + tween.update(tween.obj, dt) + } + if (dt === 1) { + if (tween.finished) { + tween.finished(tween) + } if (tween.after.length) { - var twn = tween.after.shift() + const twn = tween.after.shift() twn.obj = twn.obj || tween.obj twn.after = tween.after oktween.add(twn) @@ -92,7 +96,7 @@ oktween.update = (t) => { } }) if (done) { - tweens = tweens.filter(function(tween){ return ! tween.done }) + tweens = tweens.filter(tween => !tween.done) } } -- cgit v1.2.3-70-g09d2