Moved the gen functions into Init.

Added Tween.totalDuration and populated it from CalcDuration.
Seek now uses totalDuration for better results, but still doesn't cover delays.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '8af8f8b0-403b-11e7-bb4d-2791a8206fb6'
+build: '35aaa140-4047-11e7-a72a-f5daee9806ea'
 };
 module.exports = CHECKSUM;

v3/src/tween/Tween.js

@@ -37,6 +37,9 @@ var Tween = function (manager, data)
 
     this.paused = false;
 
+    this.totalDuration = 0;
+    this.progress = 0;
+
     this.callbacks = {
         onStart: { callback: null, scope: null, params: null },
         onUpdate: { callback: null, scope: null, params: null },
@@ -53,6 +56,7 @@ Tween.prototype.constructor = Tween;
 Tween.prototype = {
 
     init: require('./components/Init'),
+    calcDuration: require('./components/CalcDuration'),
     loadValues: require('./components/LoadValues'),
     nextState: require('./components/NextState'),
     play: require('./components/Play'),

v3/src/tween/components/CalcDuration.js

@@ -1,24 +1,45 @@
 var CalcDuration = function ()
 {
-    var total = 0;
+    var max = 0;
 
-    for (var key in this.data)
+    var data = this.data;
+
+    //  Duration is derived from:
+    //  TweenData.duration
+    //  TweenData.delay
+    //  TweenData.hold
+    //  x TweenData.repeat
+
+    for (var i = 0; i < this.totalData; i++)
     {
-        var prop = this.data[key];
+        var tweenData = data[i];
+
+        var total = tweenData.delay;
 
-        for (var i = 0; i < prop.list.length; i++)
+        var single = tweenData.duration;
+
+        if (tweenData.yoyo)
         {
-            // var tweenData = prop.list[i];
+            single *= 2;
+        }
+
+        single += tweenData.hold;
 
-            //  Duration is derived from:
-            //  TweenData.duration
-            //  TweenData.delay
-            //  TweenData.hold
-            //  x TweenData.repeat
+        var totalRepeats = (tweenData.repeat === -1) ? Number.MAX_SAFE_INTEGER : tweenData.repeat;
+
+        single += single * totalRepeats;
+
+        single += tweenData.repeatDelay * totalRepeats;
+
+        total += single;
+
+        if (total > max)
+        {
+            max = total;
         }
     }
 
-    return total;
+    return max;
 };
 
 module.exports = CalcDuration;

v3/src/tween/components/Init.js

@@ -3,6 +3,26 @@ var TWEEN_CONST = require('../const');
 //  Return true if this Tween should be moved from the pending list to the active list
 var Init = function ()
 {
+    var data = this.data;
+    var totalTargets = this.totalTargets;
+
+    for (var i = 0; i < this.totalData; i++)
+    {
+        var tweenData = data[i];
+        var target = tweenData.target;
+        var gen = tweenData.gen;
+
+        tweenData.delay = gen.delay(i, totalTargets, target);
+        tweenData.duration = gen.duration(i, totalTargets, target);
+        tweenData.hold = gen.hold(i, totalTargets, target);
+        tweenData.repeat = gen.repeat(i, totalTargets, target);
+        tweenData.repeatDelay = gen.repeatDelay(i, totalTargets, target);
+    }
+
+    this.totalDuration = this.calcDuration();
+
+    console.log('Tween totalDuration', this.totalDuration);
+
     if (this.paused)
     {
         this.state = TWEEN_CONST.PAUSED;

v3/src/tween/components/ResetTweenData.js

@@ -3,19 +3,19 @@ var TWEEN_CONST = require('../const');
 var ResetTweenData = function (resetFromLoop)
 {
     var data = this.data;
-    var totalTargets = this.totalTargets;
+    // var totalTargets = this.totalTargets;
 
     for (var i = 0; i < this.totalData; i++)
     {
         var tweenData = data[i];
-        var target = tweenData.target;
-        var gen = tweenData.gen;
-
-        tweenData.delay = gen.delay(i, totalTargets, target);
-        tweenData.duration = gen.duration(i, totalTargets, target);
-        tweenData.hold = gen.hold(i, totalTargets, target);
-        tweenData.repeat = gen.repeat(i, totalTargets, target);
-        tweenData.repeatDelay = gen.repeatDelay(i, totalTargets, target);
+        // var target = tweenData.target;
+        // var gen = tweenData.gen;
+
+        // tweenData.delay = gen.delay(i, totalTargets, target);
+        // tweenData.duration = gen.duration(i, totalTargets, target);
+        // tweenData.hold = gen.hold(i, totalTargets, target);
+        // tweenData.repeat = gen.repeat(i, totalTargets, target);
+        // tweenData.repeatDelay = gen.repeatDelay(i, totalTargets, target);
 
         tweenData.progress = 0;
         tweenData.elapsed = 0;

v3/src/tween/components/Seek.js

@@ -1,34 +1,33 @@
-var TWEEN_CONST = require('../const');
+// var TWEEN_CONST = require('../const');
 
 //  For now progress = 0 to 1
-//  Needs to be normalized with the total Tween duration, not the tweenData durations
 var Seek = function (progress)
 {
+    var marker = this.totalDuration * progress;
+
     var data = this.data;
 
+    //  Now works on multi-property tweens with varying durations, but doesn't yet factor in delays
     for (var i = 0; i < this.totalData; i++)
     {
         var tweenData = data[i];
 
-        tweenData.progress = progress;
-
-        tweenData.elapsed = tweenData.duration * progress;
-
-        // var forward = (tweenData.state === TWEEN_CONST.PLAYING_FORWARD);
-        var v;
+        if (marker >= tweenData.duration)
+        {
+            tweenData.progress = 1;
+            tweenData.elapsed = tweenData.duration;
+        }
+        else
+        {
+            tweenData.progress = marker / tweenData.duration;
+            tweenData.elapsed = marker;
+        }
 
-        // if (forward)
-        // {
-            v = tweenData.ease(progress);
-        // }
-        // else
-        // {
-        //     v = tweenData.ease(1 - progress);
-        // }
+        var v = tweenData.ease(tweenData.progress);
 
         tweenData.current = tweenData.start + ((tweenData.end - tweenData.start) * v);
 
-        // console.log('Seek', tweenData.target[tweenData.key], 'to', tweenData.current);
+        // console.log(tweenData.key, 'Seek', tweenData.target[tweenData.key], 'to', tweenData.current, 'pro', tweenData.progress, 'marker', marker, progress);
 
         tweenData.target[tweenData.key] = tweenData.current;
     }