Merge pull request #14 from CookieShade/dev-branch

Simplify animation system
CookieShade · Jul 25, 2016 · ab65ff1 · ab65ff1
2 parents 51ce68d + 64389a4
commit ab65ff1
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/BETA.js b/BETA.js
@@ -593,18 +593,17 @@
 
     //------------ANIMATION SYSTEM------------\\
 
-    var animations = {};
+    var frameId = 0;
 
     BETA.animate = function (callback)
     {
+        BETA.assert(frameId === 0, "There is already an animation running!");
+
         var prevTime;
-        var frameId;
-        var animId;
 
         frameId = requestAnimationFrame(function animationFn(time)
         {
             frameId = requestAnimationFrame(animationFn);
-            animations[animId] = frameId;
 
             var deltaTime = prevTime ?
                 (time - prevTime) / 1000
@@ -614,20 +613,14 @@
 
             prevTime = time;
         });
-
-        animId = frameId;
-
-        animations[animId] = frameId;
-
-        return animId;
     };
 
-    BETA.stopAnimation = function (id)
+    BETA.stopAnimation = function ()
     {
-        BETA.assert(animations[id], "There is no animation with ID " + id);
+        BETA.assert(frameId > 0, "There is no animation running!");
 
-        cancelAnimationFrame(animations[id]);
-        delete animations[id];
+        cancelAnimationFrame(frameId);
+        frameId = 0;
     };
 
     //-------------INPUT HANDLING-------------\\