Merged Forward and Backward into main Update function.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'c27e2550-3b57-11e7-9070-8d2076256d8f'
+build: '9f9dbde0-3b5a-11e7-8b24-4961194ce2cd'
 };
 module.exports = CHECKSUM;

v3/src/tween/components/UpdateTweenData.js

@@ -1,78 +1,17 @@
 var TWEEN_CONST = require('../const');
 
-//  Merge with Backwards and include in update?
-var Forward = function (tween, tweenData, delta)
-{
-    var elapsed = tweenData.elapsed;
-    var duration = tweenData.duration;
-
-    elapsed += delta;
-
-    if (elapsed > duration)
-    {
-        elapsed = duration;
-    }
-
-    var progress = elapsed / duration;
-
-    var p = tweenData.ease(progress);
-
-    //  Optimize
-    tween.current = tween.start + ((tween.end - tween.start) * p);
-
-    tween.target[tween.key] = tween.current;
-
-    tweenData.elapsed = elapsed;
-    tweenData.progress = progress;
-
-    if (progress === 1)
-    {
-        tweenData.state = ProcessRepeat(tween, tweenData);
-    }
-};
-
-var Backward = function (tween, tweenData, delta)
-{
-    var elapsed = tweenData.elapsed;
-    var duration = tweenData.duration;
-
-    elapsed += delta;
-
-    if (elapsed > duration)
-    {
-        elapsed = duration;
-    }
-
-    var progress = elapsed / duration;
-
-    var p = tweenData.ease(1 - progress);
-
-    //  Optimize
-    tween.current = tween.start + ((tween.end - tween.start) * p);
-
-    tween.target[tween.key] = tween.current;
-
-    tweenData.elapsed = elapsed;
-    tweenData.progress = progress;
-
-    if (progress === 1)
-    {
-        tweenData.state = ProcessRepeat(tween, tweenData);
-    }
-};
-
 //  TweenData has reached the end. Now it needs to decide what action to take.
 //  It can either hold, yoyo, repeat or complete.
-var ProcessRepeat = function (tween, tweenData)
+var ProcessRepeat = function (tween, tweenData, skipHold)
 {
     //  Do we hold?
-    if (tweenData.hold > 0)
+    if (tweenData.hold > 0 && skipHold === false)
     {
         tweenData.elapsed = tweenData.hold;
 
         return TWEEN_CONST.HOLD;
     }
-    else if (tweenData.state === TWEEN_CONST.PLAYING_FORWARD && tweenData.yoyo)
+    else if (tweenData.yoyo && tweenData.state === TWEEN_CONST.PLAYING_FORWARD)
     {
         //  Playing forward and we have a yoyo
 
@@ -115,12 +54,53 @@ var UpdateTweenData = function (tween, tweenData, timestep, delta)
 {
     switch (tweenData.state)
     {
+        case TWEEN_CONST.PLAYING_FORWARD:
+        case TWEEN_CONST.PLAYING_BACKWARD:
+
+            var elapsed = tweenData.elapsed;
+            var duration = tweenData.duration;
+
+            elapsed += delta;
+
+            if (elapsed > duration)
+            {
+                elapsed = duration;
+            }
+
+            var progress = elapsed / duration;
+            var v;
+
+            if (tweenData.state === TWEEN_CONST.PLAYING_BACKWARD)
+            {
+                v = tweenData.ease(1 - progress);
+            }
+            else
+            {
+                v = tweenData.ease(progress);
+            }
+
+            tween.current = tween.start + ((tween.end - tween.start) * v);
+
+            tween.target[tween.key] = tween.current;
+
+            tweenData.elapsed = elapsed;
+            tweenData.progress = progress;
+
+            if (progress === 1)
+            {
+                tweenData.state = ProcessRepeat(tween, tweenData, false);
+            }
+
+            break;
+
         case TWEEN_CONST.DELAY:
 
             tweenData.elapsed -= delta;
 
             if (tweenData.elapsed <= 0)
             {
+                //  TODO - Move elapsed block below switch statement
+                //  so that calls to render and play happen this frame, not the next one?
                 tweenData.elapsed = 0;
                 tweenData.state = TWEEN_CONST.PENDING_RENDER;
             }
@@ -145,9 +125,8 @@ var UpdateTweenData = function (tween, tweenData, timestep, delta)
 
             if (tweenData.elapsed <= 0)
             {
-                tweenData.elapsed = 0;
-                //  yoyo, repeat or complete
-                // tweenData.state = TWEEN_CONST.PENDING_RENDER;
+                tweenData.state = TWEEN_CONST.PLAYING_FORWARD;
+                tweenData.state = ProcessRepeat(tween, tweenData, true);
             }
 
             break;
@@ -157,18 +136,6 @@ var UpdateTweenData = function (tween, tweenData, timestep, delta)
             tween.loadValues();
             tweenData.state = TWEEN_CONST.PLAYING_FORWARD;
 
-            break;
-
-        case TWEEN_CONST.PLAYING_FORWARD:
-
-            Forward(tween, tweenData, delta);
-
-            break;
-
-        case TWEEN_CONST.PLAYING_BACKWARD:
-
-            Backward(tween, tweenData, delta);
-
             break;
     }