Updated Loader and all single-file file types to support multiple load methods. Will now work with argument based loader, a configuration object or an array of objects, per all file types. Moved lots of code out of the Loader plugin and into BaseLoader and the FileType files.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '5a41ebf0-7925-11e7-9739-c5d8872ffd75'
+build: '1a3f3c80-793c-11e7-ac05-359898771c99'
 };
 module.exports = CHECKSUM;

v3/src/loader/BaseLoader.js

@@ -3,8 +3,9 @@ var CONST = require('./const');
 var Set = require('../structs/Set');
 var XHRSettings = require('./XHRSettings');
 var Event = require('./events/');
-var EventDispatcher = require('../events/EventDispatcher');
+// var EventDispatcher = require('../events/EventDispatcher');
 var Class = require('../utils/Class');
+var ParseXMLBitmapFont = require('../gameobjects/bitmaptext/ParseXMLBitmapFont');
 
 //  Phaser.Loader.BaseLoader
 
@@ -16,9 +17,11 @@ var BaseLoader = new Class({
 
     initialize:
 
-    function BaseLoader ()
+    function BaseLoader (scene)
     {
-        this.events = new EventDispatcher();
+        this.scene = scene;
+
+        this.events = scene.sys.events;
 
         //  Move to a 'setURL' method?
         this.baseURL = '';
@@ -268,16 +271,163 @@ var BaseLoader = new Class({
         this.inflight.clear();
         this.queue.clear();
 
-        if (this.processCallback)
-        {
-            this.processCallback();
-        }
+        this.processCallback();
 
         this.state = CONST.LOADER_COMPLETE;
 
         this.events.dispatch(new Event.LOADER_COMPLETE_EVENT(this));
     },
 
+    //  The Loader has finished
+    processCallback: function ()
+    {
+        if (this.storage.size === 0)
+        {
+            return;
+        }
+
+        //  The global Texture Manager
+        var cache = this.scene.sys.cache;
+        var textures = this.scene.sys.textures;
+        var anims = this.scene.sys.anims;
+
+        //  Process multiatlas groups first
+
+        var file;
+        var fileA;
+        var fileB;
+
+        for (var key in this._multilist)
+        {
+            var data = [];
+            var images = [];
+            var keys = this._multilist[key];
+
+            for (var i = 0; i < keys.length; i++)
+            {
+                file = this.storage.get('key', keys[i]);
+
+                if (file)
+                {
+                    if (file.type === 'image')
+                    {
+                        images.push(file.data);
+                    }
+                    else if (file.type === 'json')
+                    {
+                        data.push(file.data);
+                    }
+
+                    this.storage.delete(file);
+                }
+            }
+
+            //  Do we have everything needed?
+            if (images.length + data.length === keys.length)
+            {
+                //  Yup, add them to the Texture Manager
+
+                //  Is the data JSON Hash or JSON Array?
+                if (Array.isArray(data[0].frames))
+                {
+                    textures.addAtlasJSONArray(key, images, data);
+                }
+                else
+                {
+                    textures.addAtlasJSONHash(key, images, data);
+                }
+            }
+        }
+
+        //  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':
+                    textures.addImage(file.key, file.data);
+                    break;
+
+                case 'atlasjson':
+
+                    fileA = file.fileA;
+                    fileB = file.fileB;
+
+                    if (fileA.type === 'image')
+                    {
+                        textures.addAtlas(fileA.key, fileA.data, fileB.data);
+                    }
+                    else
+                    {
+                        textures.addAtlas(fileB.key, fileB.data, fileA.data);
+                    }
+                    break;
+
+                case 'bitmapfont':
+
+                    fileA = file.fileA;
+                    fileB = file.fileB;
+
+                    if (fileA.type === 'image')
+                    {
+                        cache.bitmapFont.add(fileB.key, { data: ParseXMLBitmapFont(fileB.data), texture: fileA.key, frame: null });
+                        textures.addImage(fileA.key, fileA.data);
+                    }
+                    else
+                    {
+                        cache.bitmapFont.add(fileA.key, { data: ParseXMLBitmapFont(fileA.data), texture: fileB.key, frame: null });
+                        textures.addImage(fileB.key, fileB.data);
+                    }
+                    break;
+
+                case 'spritesheet':
+                    textures.addSpriteSheet(file.key, file.data, file.config);
+                    break;
+
+                case 'json':
+                    cache.json.add(file.key, file.data);
+                    break;
+
+                case 'xml':
+                    cache.xml.add(file.key, file.data);
+                    break;
+
+                case 'text':
+                    cache.text.add(file.key, file.data);
+                    break;
+
+                case 'binary':
+                    cache.binary.add(file.key, file.data);
+                    break;
+
+                case 'sound':
+                    cache.sound.add(file.key, file.data);
+                    break;
+
+                case 'glsl':
+                    cache.shader.add(file.key, file.data);
+                    break;
+            }
+        });
+
+        animJSON.forEach(function (file)
+        {
+            anims.fromJSON(file.data);
+        });
+
+        this.storage.clear();
+    },
+
     reset: function ()
     {
         this.list.clear();

v3/src/loader/filetypes/AnimationJSONFile.js

@@ -10,4 +10,23 @@ var AnimationJSONFile = function (key, url, path, xhrSettings)
     return json;
 };
 
+AnimationJSONFile.create = function (loader, key, url, xhrSettings)
+{
+    if (Array.isArray(key))
+    {
+        for (var i = 0; i < key.length; i++)
+        {
+            //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
+            loader.addFile(new AnimationJSONFile(key[i], url, loader.path, xhrSettings));
+        }
+    }
+    else
+    {
+        loader.addFile(new AnimationJSONFile(key, url, loader.path, xhrSettings));
+    }
+
+    //  For method chaining
+    return loader;
+};
+
 module.exports = AnimationJSONFile;

v3/src/loader/filetypes/BinaryFile.js

@@ -1,6 +1,7 @@
 var Class = require('../../utils/Class');
 var CONST = require('../const');
 var File = require('../File');
+var GetFastValue = require('../../utils/object/GetFastValue');
 
 //  Phaser.Loader.FileTypes.BinaryFile
 
@@ -12,14 +13,16 @@ var BinaryFile = new Class({
 
     function BinaryFile (key, url, path, xhrSettings)
     {
+        var fileKey = (typeof key === 'string') ? key : GetFastValue(key, 'key', '');
+
         var fileConfig = {
             type: 'binary',
-            extension: 'bin',
+            extension: GetFastValue(key, 'extension', 'bin'),
             responseType: 'arraybuffer',
-            key: key,
-            url: url,
+            key: fileKey,
+            url: GetFastValue(key, 'file', url),
             path: path,
-            xhrSettings: xhrSettings
+            xhrSettings: GetFastValue(key, 'xhr', xhrSettings)
         };
 
         File.call(this, fileConfig);
@@ -38,4 +41,23 @@ var BinaryFile = new Class({
 
 });
 
+BinaryFile.create = function (loader, key, url, xhrSettings)
+{
+    if (Array.isArray(key))
+    {
+        for (var i = 0; i < key.length; i++)
+        {
+            //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
+            loader.addFile(new BinaryFile(key[i], url, loader.path, xhrSettings));
+        }
+    }
+    else
+    {
+        loader.addFile(new BinaryFile(key, url, loader.path, xhrSettings));
+    }
+
+    //  For method chaining
+    return loader;
+};
+
 module.exports = BinaryFile;

v3/src/loader/filetypes/GLSLFile.js

@@ -1,6 +1,7 @@
 var Class = require('../../utils/Class');
 var CONST = require('../const');
 var File = require('../File');
+var GetFastValue = require('../../utils/object/GetFastValue');
 
 //  Phaser.Loader.FileTypes.GLSLFile
 
@@ -12,14 +13,16 @@ var GLSLFile = new Class({
 
     function GLSLFile (key, url, path, xhrSettings)
     {
+        var fileKey = (typeof key === 'string') ? key : GetFastValue(key, 'key', '');
+
         var fileConfig = {
             type: 'glsl',
-            extension: 'glsl',
+            extension: GetFastValue(key, 'extension', 'glsl'),
             responseType: 'text',
-            key: key,
-            url: url,
+            key: fileKey,
+            url: GetFastValue(key, 'file', url),
             path: path,
-            xhrSettings: xhrSettings
+            xhrSettings: GetFastValue(key, 'xhr', xhrSettings)
         };
 
         File.call(this, fileConfig);
@@ -38,4 +41,23 @@ var GLSLFile = new Class({
 
 });
 
+GLSLFile.create = function (loader, key, url, xhrSettings)
+{
+    if (Array.isArray(key))
+    {
+        for (var i = 0; i < key.length; i++)
+        {
+            //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
+            loader.addFile(new GLSLFile(key[i], url, loader.path, xhrSettings));
+        }
+    }
+    else
+    {
+        loader.addFile(new GLSLFile(key, url, loader.path, xhrSettings));
+    }
+
+    //  For method chaining
+    return loader;
+};
+
 module.exports = GLSLFile;

v3/src/loader/filetypes/HTMLFile.js

@@ -1,6 +1,7 @@
 var Class = require('../../utils/Class');
 var CONST = require('../const');
 var File = require('../File');
+var GetFastValue = require('../../utils/object/GetFastValue');
 
 //  Phaser.Loader.FileTypes.HTMLFile
 
@@ -15,14 +16,16 @@ var HTMLFile = new Class({
         if (width === undefined) { width = 512; }
         if (height === undefined) { height = 512; }
 
+        var fileKey = (typeof key === 'string') ? key : GetFastValue(key, 'key', '');
+
         var fileConfig = {
             type: 'html',
-            extension: 'html',
+            extension: GetFastValue(key, 'extension', 'html'),
             responseType: 'text',
-            key: key,
-            url: url,
+            key: fileKey,
+            url: GetFastValue(key, 'file', url),
             path: path,
-            xhrSettings: xhrSettings,
+            xhrSettings: GetFastValue(key, 'xhr', xhrSettings),
             config: {
                 width: width,
                 height: height
@@ -92,4 +95,23 @@ var HTMLFile = new Class({
 
 });
 
+HTMLFile.create = function (loader, key, url, width, height, xhrSettings)
+{
+    if (Array.isArray(key))
+    {
+        for (var i = 0; i < key.length; i++)
+        {
+            //  If it's an array it has to be an array of Objects, so we get everything out of the 'key' object
+            loader.addFile(new HTMLFile(key[i], url, width, height, loader.path, xhrSettings));
+        }
+    }
+    else
+    {
+        loader.addFile(new HTMLFile(key, url, width, height, loader.path, xhrSettings));
+    }
+
+    //  For method chaining
+    return loader;
+};
+
 module.exports = HTMLFile;