dont reset frame when looping

straker · Jul 14, 2018 · 9e50638 · 9e50638
1 parent b3739b9
commit 9e50638
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 8 deletions.
diff --git a/dist/sprite.js b/dist/sprite.js
diff --git a/docs/js/kontra.js b/docs/js/kontra.js
@@ -1733,9 +1733,15 @@ this.kontra = {
      * @param {boolean} [loop=true] - If the animation should loop.
      */
     playAnimation: function playAnimation(name, loop) {
+      loop = (loop == undefined ? true : loop);
+
       this.currentAnimation = this.animations[name];
-      this.currentAnimation.loop = (loop == undefined ? true : loop);
-      this.currentAnimation._frame = 0;
+      this.currentAnimation.loop = loop;
+
+      // reset the frame if we shouldn't loop the animation, that way
+      // changing animations on keydown doesn't constantly reset the
+      // frame
+      if (!loop) this.currentAnimation._frame = 0;
     },
 
     /**

diff --git a/examples/tileEngine/index.html b/examples/tileEngine/index.html
@@ -11,6 +11,7 @@
 </head>
 <body>
   <canvas width="600" height="600"></canvas>
+  <p>M - Mute</p>
   <script id="code">
   /**
    * ATTRIBUTION:
@@ -201,7 +202,12 @@
       }
     });
 
+    kontra.keys.bind('m', function() {
+      kontra.assets.audio.Digital_Forest.muted = !kontra.assets.audio.Digital_Forest.muted;
+    });
+
     kontra.assets.audio.Digital_Forest.loop = true;
+    kontra.assets.audio.Digital_Forest.volume = 0.5;
     kontra.assets.audio.Digital_Forest.play();
     loop.start();
   });

diff --git a/kontra.js b/kontra.js
@@ -1733,9 +1733,15 @@ this.kontra = {
      * @param {boolean} [loop=true] - If the animation should loop.
      */
     playAnimation: function playAnimation(name, loop) {
+      loop = (loop == undefined ? true : loop);
+
       this.currentAnimation = this.animations[name];
-      this.currentAnimation.loop = (loop == undefined ? true : loop);
-      this.currentAnimation._frame = 0;
+      this.currentAnimation.loop = loop;
+
+      // reset the frame if we shouldn't loop the animation, that way
+      // changing animations on keydown doesn't constantly reset the
+      // frame
+      if (!loop) this.currentAnimation._frame = 0;
     },
 
     /**