Lots of Tween updates, fleshing out concepts and ideas.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'a21447a0-34c1-11e7-a7cc-235ca839179c'
+build: '52ed8ac0-3529-11e7-a5a4-694da76b1298'
 };
 module.exports = CHECKSUM;

v3/src/tween/Tween.js

@@ -1,7 +1,8 @@
 var GetValue = require('../utils/object/GetValue');
 var GetEaseFunction = require('./GetEaseFunction');
 var CloneObject = require('../utils/object/Clone');
-var TweenData = require('./TweenData');
+var MergeRight = require('../utils/object/MergeRight');
+// var TweenData = require('./TweenData');
 
 var RESERVED = [ 'targets', 'ease', 'duration', 'yoyo', 'repeat', 'loop', 'paused', 'useFrames', 'offset' ];
 
@@ -58,6 +59,14 @@ var RESERVED = [ 'targets', 'ease', 'duration', 'yoyo', 'repeat', 'loop', 'pause
         y: { value: 300, duration: 1000, ease: 'Sine' }
     });
 
+    var tween = this.tweens.add({
+        targets: player,
+        props: {
+            x: { value: 400, duration: 2000, ease: 'Power1' },
+            y: { value: 300, duration: 1000, ease: 'Sine' }
+        }
+    });
+
  */
 
 var Tween = function (manager, config)
@@ -97,6 +106,16 @@ var Tween = function (manager, config)
         this.loop = true;
     }
 
+    //  Move to global
+    this.defaultInstance = {
+        key: '',
+        running: false,
+        complete: false,
+        current: 0,
+        queue: [],
+        totalDuration: 0
+    };
+
     this.defaultTweenData = {
         value: undefined,
         progress: 0,
@@ -107,13 +126,21 @@ var Tween = function (manager, config)
         repeat: this.repeat,
         loop: this.loop,
         delay: this.delay,
-        startAt: undefined
+        startAt: undefined,
+        elapsed: 0
     };
 
     this.paused = GetValue(config, 'paused', false);
 
     this.useFrames = GetValue(config, 'useFrames', false);
 
+    this.autoStart = GetValue(config, 'autoStart', true);
+
+    this.running = this.autoStart;
+
+    this.progress = 0;
+    this.totalDuration = 0;
+
     this.onStart;
     this.onStartScope;
     this.onStartParams;
@@ -158,29 +185,131 @@ Tween.prototype = {
     {
         //  For now let's just assume `config.props` is being used:
 
-        // this.defaultTweenData = {
-        //     value: undefined,
-        //     progress: 0,
-        //     startTime: 0,
-        //     ease: this.ease,
-        //     duration: this.duration,
-        //     yoyo: this.yoyo,
-        //     repeat: this.repeat,
-        //     loop: this.loop,
-        //     delay: this.delay,
-        //     startAt: undefined
-        // };
+        // props: {
+        //     x: 400,
+        //     y: 300
+        // }
+
+        // props: {
+        //     x: { value: 400, duration: 2000, ease: 'Power1' },
+        //     y: { value: 300, duration: 1000, ease: 'Sine' }
+        // }
 
         for (var key in config.props)
         {
-            var data = CloneObject(this.defaultTweenData);
-
-            this.props[key] = 
+            //  Check it's not a string or number (or function?)
+            //  TODO: value might be an Array
+
+            var data;
+            var value = config.props[key];
+
+            if (typeof value === 'number')
+            {
+                data = CloneObject(this.defaultTweenData);
+
+                data.value = value;
+            }
+            else if (typeof value === 'string')
+            {
+                //  Do something :)
+            }
+            else
+            {
+                data = MergeRight(this.defaultTweenData, config.props[key]);
+            }
+
+            //  this.props = [
+            //      {
+            //          key: 'x',
+            //          running: true,
+            //          complete: false,
+            //          current: 0,
+            //          queue: [ TweenData, TweenData, TweenData ],
+            //          totalDuration: Number (ms)
+            //      }
+            //  ]
+
+            //  Convert to ms
+            data.duration *= 1000;
+
+            var propertyMarker = CloneObject(this.defaultInstance);
+
+            propertyMarker.key = key;
+
+            //  Adapt these to support array based multi-inserts
+            propertyMarker.queue.push(data);
+            propertyMarker.totalDuration = data.duration;
+
+            this.props.push(propertyMarker);
+
+            this.totalDuration += propertyMarker.totalDuration;
         }
     },
 
     update: function (timestep, delta)
     {
+        if (!this.running)
+        {
+            return;
+        }
+
+        //  Calculate tweens
+
+        var list = this.props;
+        var targets = this.targets;
+
+        //  this.props = [
+        //      {
+        //          key: 'x',
+        //          start: [ Target0 startValue, Target1 startValue, Target2 startValue ],
+        //          running: true,
+        //          complete: false,
+        //          current: 0,
+        //          queue: [ TweenData, TweenData, TweenData ],
+        //          totalDuration: Number (ms)
+        //      }
+        //  ]
+
+        for (var i = 0; i < list.length; i++)
+        {
+            var entry = list[i];
+
+            //  Update TweenData
+
+            if (entry.running)
+            {
+                // TweenData = {
+                //     value: undefined,
+                //     progress: 0,
+                //     startTime: 0,
+                //     ease: this.ease,
+                //     duration: this.duration,
+                //     yoyo: this.yoyo,
+                //     repeat: this.repeat,
+                //     loop: this.loop,
+                //     delay: this.delay,
+                //     startAt: undefined,
+                //     elapsed: 0
+                // };
+
+                var tweenData = entry.queue[entry.current];
+
+                tweenData.elapsed += delta;
+
+                if (tweenData.elapsed > tweenData.duration)
+                {
+                    tweenData.elapsed = tweenData.duration;
+                }
+
+                //  What % is that?
+                tweenData.progress = tweenData.elapsed / tweenData.duration;
+
+                for (var t = 0; t < targets.length; t++)
+                {
+                    targets[i][entry.key] = tweenData.value;
+                }
+            }
+        }
 
     },
 

v3/src/tween/TweenData.js

@@ -31,7 +31,7 @@ TweenData.prototype = {
 
 var TweenData = function (config)
 {
-    this.property = ;
+    this.property;
 
     this.value;
 

v3/src/tween/TweenManager.js

@@ -1,5 +1,4 @@
 
-var GetValue = require('../utils/object/GetValue');
 var EventDispatcher = require('../events/EventDispatcher');
 var Tween = require('./Tween');
 
@@ -27,6 +26,11 @@ TweenManager.prototype = {
 
     add: function (config)
     {
+        var tween = new Tween(this, config);
+
+        this.list.push(tween);
+
+        return tween;
     },
 
     //  Add a 'to' GSAP equivalent?
@@ -41,7 +45,12 @@ TweenManager.prototype = {
 
     update: function (timestamp, delta)
     {
+        var list = this.list;
 
+        for (var i = 0; i < list.length; i++)
+        {
+            list[i].update(timestamp, delta);
+        }
     },
 
     globalTimeScale: function ()