Added Animation.delay, repeat and repeatDelay, and fixed scoping issues and return values.

Author: photonstorm

v3/src/animation/frame/Animation.js

@@ -82,10 +82,10 @@ Animation.prototype = {
             component.duration = this.duration;
             component.msPerFrame = this.msPerFrame;
             component.skipMissedFrames = this.skipMissedFrames;
-            component.delay = this.delay;
-            component.repeat = this.repeat;
-            component.repeatDelay = this.repeatDelay;
-            component.yoyo = this.yoyo;
+            component._delay = this.delay;
+            component._repeat = this.repeat;
+            component._repeatDelay = this.repeatDelay;
+            component._yoyo = this.yoyo;
         }
 
         component.updateFrame(this.frames[startFrame]);
@@ -106,7 +106,7 @@ Animation.prototype = {
 
         if (includeDelay)
         {
-            component.nextTick += (component.delay * 1000);
+            component.nextTick += (component._delay * 1000);
         }
     },
 
@@ -187,11 +187,11 @@ Animation.prototype = {
 
     repeatAnimation: function (component)
     {
-        if (component.repeatDelay > 0 && component.pendingRepeat === false)
+        if (component._repeatDelay > 0 && component.pendingRepeat === false)
         {
             component.pendingRepeat = true;
             component.accumulator -= component.nextTick;
-            component.nextTick += (component.repeatDelay * 1000);
+            component.nextTick += (component._repeatDelay * 1000);
         }
         else
         {

v3/src/animation/frame/Delay.js

@@ -0,0 +1,20 @@
+//  Gets or sets the amount of time in seconds between repeats.
+//  For example, if repeat is 2 and repeatDelay is 1, the animation will play initially,
+//  then wait for 1 second before it repeats, then play again, then wait 1 second again
+//  before doing its final repeat.
+
+var Delay = function (value)
+{
+    if (value === undefined)
+    {
+        return this._delay;
+    }
+    else
+    {
+        this._delay = value;
+
+        return this;
+    }
+};
+
+module.exports = Delay;

v3/src/animation/frame/DelayedPlay.js

@@ -4,7 +4,7 @@ var DelayedPlay = function (delay, key, startFrame)
 
     this.nextTick += (delay * 1000);
 
-    return this.parent;
+    return this;
 };
 
 module.exports = DelayedPlay;

v3/src/animation/frame/Load.js

@@ -9,6 +9,8 @@ var Load = function (key, startFrame)
 
     //  Load the new animation in
     this.animationManager.load(this, key, startFrame);
+
+    return this;
 };
 
 module.exports = Load;

v3/src/animation/frame/Pause.js

@@ -1,11 +1,16 @@
-var Pause = function ()
+var Pause = function (atFrame)
 {
     if (!this._paused)
     {
         this._paused = true;
         this._wasPlaying = this.isPlaying;
         this.isPlaying = false;
     }
+
+    if (atFrame !== undefined)
+    {
+        this.updateFrame(atFrame);
+    }
 
     return this;
 };

v3/src/animation/frame/Play.js

@@ -5,7 +5,7 @@ var Play = function (key, startFrame)
     this.load(key, startFrame);
 
     //  Should give us 9,007,199,254,740,991 safe repeats
-    this.repeatCounter = (this.repeat === -1) ? Number.MAX_SAFE_INTEGER : this.repeat;
+    this.repeatCounter = (this._repeat === -1) ? Number.MAX_SAFE_INTEGER : this._repeat;
 
     this.currentAnim.getFirstTick(this);
 
@@ -15,7 +15,7 @@ var Play = function (key, startFrame)
 
     this.prevTick = this.mainloop.lastFrameTimeMs;
 
-    return this.parent;
+    return this;
 };
 
 module.exports = Play;

v3/src/animation/frame/Progress.js

@@ -1,16 +1,25 @@
 //  Value between 0 and 1. How far this animation is through, ignoring repeats and yoyos.
 //  If the animation has a non-zero repeat defined, progress and totalProgress will be different
 //  because progress doesn't include any repeats or repeatDelays whereas totalProgress does.
-var Progress = function ()
+var Progress = function (value)
 {
-    var p = this.currentFrame.progress;
-
-    if (!this.forward)
+    if (value === undefined)
     {
-        p = 1 - p;
+        var p = this.currentFrame.progress;
+
+        if (!this.forward)
+        {
+            p = 1 - p;
+        }
+
+        return p;
     }
+    else
+    {
+        //  TODO: Set progress
 
-    return p;
+        return this;
+    }
 };
 
 module.exports = Progress;

v3/src/animation/frame/Repeat.js

@@ -0,0 +1,21 @@
+//  Gets or sets the number of times that the animation should repeat
+//  after its first iteration. For example, if repeat is 1, the animation will
+//  play a total of twice (the initial play plus 1 repeat).
+//  To repeat indefinitely, use -1. repeat should always be an integer.
+
+var Repeat = function (value)
+{
+    if (value === undefined)
+    {
+        return this._repeat;
+    }
+    else
+    {
+        this._repeat = value;
+        this.repeatCounter = 0;
+
+        return this;
+    }
+};
+
+module.exports = Repeat;

v3/src/animation/frame/RepeatDelay.js

@@ -0,0 +1,20 @@
+//  Gets or sets the amount of time in seconds between repeats.
+//  For example, if repeat is 2 and repeatDelay is 1, the animation will play initially,
+//  then wait for 1 second before it repeats, then play again, then wait 1 second again
+//  before doing its final repeat.
+
+var RepeatDelay = function (value)
+{
+    if (value === undefined)
+    {
+        return this._repeatDelay;
+    }
+    else
+    {
+        this._repeatDelay = value;
+
+        return this;
+    }
+};
+
+module.exports = RepeatDelay;

v3/src/animation/frame/Restart.js

@@ -13,7 +13,7 @@ var Restart = function (includeDelay)
     //  Set frame
     this.updateFrame(this.currentAnim.frames[0]);
 
-    return this.parent;
+    return this;
 };
 
 module.exports = Restart;