Fixed ability for it to load multi-part files and parse atlas data.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: '93743af0-bc37-11e6-aeba-eb636dae81ab'
+build: 'cf1b58d0-bc6a-11e6-80ab-e1859222c781'
 };
 module.exports = CHECKSUM;

v3/src/gameobjects/image/ImageFactory.js

@@ -31,15 +31,15 @@ var ImageFactory = {
     {
         if (group === undefined) { group = this.state; }
 
-        console.log('ImageFactory.add', key, x, y, frame, group);
-        console.log('into State', this.state);
+        // console.log('ImageFactory.add', key, x, y, frame, group);
+        // console.log('into State', this.state);
 
         return group.children.add(new Image(this.state, x, y, key, frame));
     },
 
     make: function (x, y, key, frame)
     {
-        console.log('ImageFactory.make', key, x, y, frame);
+        // console.log('ImageFactory.make', key, x, y, frame);
 
         return new Image(this.state, x, y, key, frame);
     }

v3/src/loader/BaseLoader.js

@@ -245,8 +245,8 @@ BaseLoader.prototype = {
             if (file.state === CONST.FILE_COMPLETE && file.linkFile.state === CONST.FILE_COMPLETE)
             {
                 //  Partner has loaded, so add them both to Storage
-                this.storage.add(file);
-                this.storage.add(file.linkFile);
+
+                this.storage.add({ type: file.linkType, fileA: file, fileB: file.linkFile });
 
                 this.queue.delete(file.linkFile);
 

v3/src/loader/File.js

@@ -37,6 +37,7 @@ var File = function (type, key, url, responseType)
 
     //  Multipart file? (i.e. an atlas and its json together)
     this.linkFile = undefined;
+    this.linkType = '';
 
     this.callback = null;
 };

v3/src/loader/filetypes/AtlasJSONFile.js

@@ -10,6 +10,10 @@ var AtlasJSONFile = function (key, textureURL, atlasURL, path)
     image.linkFile = data;
     data.linkFile = image;
 
+    //  Set the type
+    image.linkType = 'atlasjson';
+    data.linkType = 'atlasjson';
+
     return image;
 };
 

v3/src/loader/filetypes/BinaryFile.js

@@ -32,6 +32,8 @@ BinaryFile.prototype.onProcess = function (callback)
 
     this.data = this.xhrLoader.response;
 
+    this.onComplete();
+
     callback(this);
 };
 

v3/src/loader/filetypes/GLSLFile.js

@@ -32,6 +32,8 @@ GLSLFile.prototype.onProcess = function (callback)
 
     this.data = this.xhrLoader.responseText;
 
+    this.onComplete();
+
     callback(this);
 };
 

v3/src/loader/filetypes/JSONFile.js

@@ -32,6 +32,8 @@ JSONFile.prototype.onProcess = function (callback)
 
     this.data = JSON.parse(this.xhrLoader.responseText);
 
+    this.onComplete();
+
     callback(this);
 };
 

v3/src/loader/filetypes/TextFile.js

@@ -32,6 +32,8 @@ TextFile.prototype.onProcess = function (callback)
 
     this.data = this.xhrLoader.responseText;
 
+    this.onComplete();
+
     callback(this);
 };
 

v3/src/loader/filetypes/XMLFile.js

@@ -38,6 +38,8 @@ XMLFile.prototype.onProcess = function (callback)
         throw new Error('XMLFile: Invalid XML');
     }
 
+    this.onComplete();
+
     callback(this);
 };