Planning new vStart cache.

Author: photonstorm

src/tween/Tween.js

@@ -78,14 +78,29 @@ Phaser.Tween = function (target, game, manager) {
     this.onStart = new Phaser.Signal();
 
     /**
-    * The onLoop event is fired if the Tween loops. If there are chained tweens it fires after all the child tweens have completed.
+    * The onLoop event is fired if the Tween or any child tween loops.
     * It will be sent 2 parameters: the target object and this tween.
     * @property {Phaser.Signal} onLoop
     */
     this.onLoop = new Phaser.Signal();
 
     /**
-    * The onComplete event is fired when the Tween completes. Does not fire if the Tween is set to loop or repeatAll(-1).
+    * The onRepeat event is fired if the Tween and all of its children repeats. If this tween has no children this will never be fired.
+    * It will be sent 2 parameters: the target object and this tween.
+    * @property {Phaser.Signal} onRepeat
+    */
+    this.onRepeat = new Phaser.Signal();
+
+    /**
+    * The onChildComplete event is fired when the Tween or any of its children completes.
+    * Fires every time a child completes unless a child is set to repeat forever.
+    * It will be sent 2 parameters: the target object and this tween.
+    * @property {Phaser.Signal} onChildComplete
+    */
+    this.onChildComplete = new Phaser.Signal();
+
+    /**
+    * The onComplete event is fired when the Tween and all of its children completes. Does not fire if the Tween is set to loop or repeatAll(-1).
     * It will be sent 2 parameters: the target object and this tween.
     * @property {Phaser.Signal} onComplete
     */
@@ -646,41 +661,61 @@ Phaser.Tween.prototype = {
         }
         else if (status === Phaser.TweenData.COMPLETE)
         {
+            var complete = false;
+
             //  What now?
             if (this.reverse)
             {
                 this.current--;
+
+                if (this.current < 0)
+                {
+                    this.current = this.timeline.length - 1;
+                    complete = true;
+                }
             }
             else
             {
                 this.current++;
+
+                if (this.current === this.timeline.length)
+                {
+                    this.current = 0;
+                    complete = true;
+                }
             }
 
-            if (this.repeatCounter === -1 || this.repeatCounter > 0)
+            if (complete)
             {
-                if (this.repeatCounter !== -1)
+                //  We've reached the start or end of the child tweens (depending on Tween.reverse), should we repeat it?
+                if (this.repeatCounter === -1)
                 {
-                    this.repeatCounter--;
+                    this.timeline[this.current].start();
+                    this.onRepeat.dispatch(this.target, this);
+                    return true;
                 }
-
-                if (this.current < 0)
+                else if (this.repeatCounter > 0)
                 {
-                    this.current = this.timeline.length - 1;
+                    this.repeatCounter--;
+
+                    this.timeline[this.current].start();
+                    this.onRepeat.dispatch(this.target, this);
+                    return true;
                 }
-                else if (this.current === this.timeline.length)
+                else
                 {
-                    this.current = 0;
+                    //  No more repeats and no more children, so we're done
+                    this.isRunning = false;
+                    this.onComplete.dispatch(this.target, this);
+                    return false;
                 }
-
-                this.timeline[this.current].start();
-                return true;
             }
             else
             {
-                //  And we're done
-                this.isRunning = false;
-                this.onComplete.dispatch(this.target, this);
-                return false;
+                //  We've still got some children to go
+                this.onChildComplete.dispatch(this.target, this);
+                this.timeline[this.current].start();
+                return true;
             }
         }
 

src/tween/TweenData.js

@@ -207,10 +207,6 @@ Phaser.TweenData.prototype = {
     */
     loadValues: function () {
 
-        this.isRunning = true;
-        this.dt = 0;
-        this.yoyoCounter = 0;
-
         for (var property in this.vEnd)
         {
             //  Check if an Array was provided as property value
@@ -242,6 +238,20 @@ Phaser.TweenData.prototype = {
             this.vEndCache[property] = this.vEnd[property];
         }
 
+        if (this.parent.reverse)
+        {
+            this.dt = this.duration;
+        }
+        else
+        {
+            this.dt = 0;
+        }
+
+        this.isRunning = true;
+        this.yoyoCounter = 0;
+
+        console.log('loadValues', this.dt, this.vStart, this.vEnd);
+
         return this;
 
     },
@@ -362,7 +372,14 @@ Phaser.TweenData.prototype = {
 
         this.startTime = this.game.time.time + this.delay;
 
-        this.dt = 0;
+        if (this.parent.reverse)
+        {
+            this.dt = this.duration;
+        }
+        else
+        {
+            this.dt = 0;
+        }
 
         return Phaser.TweenData.LOOPED;