Added AnimationJSON Loader File type.

Fixed ToJSON component.

Author: photonstorm

v3/src/animation/manager/components/ToJSON.js

@@ -1,6 +1,6 @@
 var ToJSON = function (key)
 {
-    if (key !== undefined)
+    if (key !== undefined && key !== '')
     {
         return this.anims.get(key).toJSON();
     }
@@ -11,9 +11,9 @@ var ToJSON = function (key)
             globalTimeScale: this.globalTimeScale
         };
 
-        this.anims.each(function (key, anim)
+        this.anims.each(function (animationKey, animation)
         {
-            output.anims.push(anim.toJSON());
+            output.anims.push(animation.toJSON());
         });
 
         return output;

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'eae2f6e0-1f7f-11e7-80fd-a118a22c105c'
+build: 'd62d2ed0-1f8b-11e7-b52d-db08b948d03e'
 };
 module.exports = CHECKSUM;

v3/src/loader/filetypes/AnimationJSONFile.js

@@ -0,0 +1,13 @@
+var JSONFile = require('./JSONFile.js');
+
+var AnimationJSONFile = function (key, url, path, xhrSettings)
+{
+    var json = new JSONFile(key, url, path, xhrSettings);
+
+    //  Override the File type
+    json.type = 'animationJSON';
+
+    return json;
+};
+
+module.exports = AnimationJSONFile;

v3/src/state/systems/Loader.js

@@ -3,6 +3,7 @@ var BaseLoader = require('../../loader/BaseLoader');
 var NumberArray = require('../../utils/array/NumberArray');
 
 var ImageFile = require('../../loader/filetypes/ImageFile');
+var AnimationJSONFile = require('../../loader/filetypes/AnimationJSONFile');
 var JSONFile = require('../../loader/filetypes/JSONFile');
 var XMLFile = require('../../loader/filetypes/XMLFile');
 var BinaryFile = require('../../loader/filetypes/BinaryFile');
@@ -88,6 +89,13 @@ Loader.prototype.image = function (key, url, xhrSettings)
     return this.addFile(file);
 };
 
+Loader.prototype.animation = function (key, url, xhrSettings)
+{
+    var file = new AnimationJSONFile(key, url, this.path, xhrSettings);
+
+    return this.addFile(file);
+};
+
 Loader.prototype.json = function (key, url, xhrSettings)
 {
     var file = new JSONFile(key, url, this.path, xhrSettings);
@@ -230,6 +238,7 @@ Loader.prototype.processCallback = function ()
     //  The global Texture Manager
     var cache = this.state.sys.cache;
     var textures = this.state.sys.textures;
+    var anims = this.state.sys.anims;
 
     //  Process multiatlas groups first
 
@@ -279,10 +288,19 @@ Loader.prototype.processCallback = function ()
         }
     }
 
+    //  Process all of the files
+
+    //  Because AnimationJSON may require images to be loaded first, we process them last
+    var animJSON = [];
+
     this.storage.each(function (file)
     {
         switch (file.type)
         {
+            case 'animationJSON':
+                animJSON.push(file);
+                break;
+
             case 'image':
             case 'svg':
             case 'html':
@@ -351,6 +369,11 @@ Loader.prototype.processCallback = function ()
         }
     });
 
+    animJSON.forEach(function (file)
+    {
+        anims.fromJSON(file.data);
+    });
+
     this.storage.clear();
 };