BaseLoader renamed LoaderPlugin, const updated, index updated.

Author: photonstorm

src/loader/Loader.js

@@ -2,24 +2,20 @@ var Class = require('../utils/Class');
 var CONST = require('./const');
 var CustomSet = require('../structs/Set');
 var EventEmitter = require('eventemitter3');
-var ParseXMLBitmapFont = require('../gameobjects/bitmaptext/ParseXMLBitmapFont');
-var XHRSettings = require('./XHRSettings');
 var FileTypesManager = require('./FileTypesManager');
+var ParseXMLBitmapFont = require('../gameobjects/bitmaptext/ParseXMLBitmapFont');
 var PluginManager = require('../plugins/PluginManager');
+var XHRSettings = require('./XHRSettings');
 
-//  Phaser.Loader.BaseLoader
-
-//  To finish the loader ...
-//
-//  3) Progress update
+//  Phaser.Loader.LoaderPlugin
 
-var BaseLoader = new Class({
+var LoaderPlugin = new Class({
 
     Extends: EventEmitter,
 
     initialize:
 
-    function BaseLoader (scene)
+    function LoaderPlugin (scene)
     {
         EventEmitter.call(this);
 
@@ -107,7 +103,7 @@ var BaseLoader = new Class({
 
     start: function ()
     {
-        console.log(this.scene.sys.settings.key, '- BaseLoader start. Files to load:', this.list.size);
+        console.log(this.scene.sys.settings.key, '- LoaderPlugin start. Files to load:', this.list.size);
 
         if (!this.isReady())
         {
@@ -143,7 +139,7 @@ var BaseLoader = new Class({
 
     processLoadQueue: function ()
     {
-        // console.log('======== BaseLoader processLoadQueue');
+        // console.log('======== LoaderPlugin processLoadQueue');
         // console.log('List size', this.list.size);
         // console.log(this.inflight.size, 'items still in flight. Can load another', (this.maxParallelDownloads - this.inflight.size));
 
@@ -213,7 +209,7 @@ var BaseLoader = new Class({
 
     finishedLoading: function ()
     {
-        // console.log('---> BaseLoader.finishedLoading PROCESSING', this.queue.size, 'files');
+        // console.log('---> LoaderPlugin.finishedLoading PROCESSING', this.queue.size, 'files');
 
         if(this.state === CONST.LOADER_PROCESSING)
         {
@@ -496,7 +492,7 @@ var BaseLoader = new Class({
         if (filename === undefined) { filename = 'file.json'; }
         if (filetype === undefined) { filetype = 'application/json'; }
 
-        var blob = new Blob([data], { type: filetype });
+        var blob = new Blob([ data ], { type: filetype });
 
         var url = URL.createObjectURL(blob);
 
@@ -528,6 +524,12 @@ var BaseLoader = new Class({
         this.state = CONST.LOADER_IDLE;
     },
 
+    shutdown: function ()
+    {
+        this.reset();
+        this.state = CONST.LOADER_SHUTDOWN;
+    },
+
     destroy: function ()
     {
         this.reset();
@@ -536,6 +538,6 @@ var BaseLoader = new Class({
 
 });
 
-PluginManager.register('Loader', Loader, 'load');
+PluginManager.register('Loader', LoaderPlugin, 'load');
 
-module.exports = BaseLoader;
+module.exports = LoaderPlugin;

src/loader/BaseLoader.js src/loader/LoaderPlugin.jssrc/loader/BaseLoader.js renamed to src/loader/LoaderPlugin.js

@@ -4,17 +4,35 @@ var FILE_CONST = {
     LOADER_LOADING: 1,
     LOADER_PROCESSING: 2,
     LOADER_COMPLETE: 3,
-    LOADER_DESTROYED: 4,
-
-    FILE_PENDING: 5,      // file is in the load queue but not yet started
-    FILE_LOADING: 6,      // file has been started to load by the loader (onLoad called)
-    FILE_LOADED: 7,       // file has loaded successfully, awaiting processing
-    FILE_FAILED: 8,       // file failed to load
-    FILE_PROCESSING: 9,   // file is being processed (onProcess callback)
-    FILE_WAITING_LINKFILE: 10,   // file is being processed (onProcess callback)
-    FILE_ERRORED: 11,   // file is being processed (onProcess callback)
-    FILE_COMPLETE: 12,     // file has finished processing
-    FILE_DESTROYED: 13,     // file has been destroyed
+    LOADER_SHUTDOWN: 4,
+    LOADER_DESTROYED: 5,
+
+    //  File is in the load queue but not yet started
+    FILE_PENDING: 10,
+
+    //  File has been started to load by the loader (onLoad called)
+    FILE_LOADING: 11,
+
+    //  File has loaded successfully, awaiting processing    
+    FILE_LOADED: 12,
+
+    //  File failed to load
+    FILE_FAILED: 13,
+
+    //  File is being processed (onProcess callback)
+    FILE_PROCESSING: 14,
+
+    //  File is being processed (onProcess callback)
+    FILE_WAITING_LINKFILE: 15,
+
+    //  File is being processed (onProcess callback)
+    FILE_ERRORED: 16,
+
+    //  File has finished processing
+    FILE_COMPLETE: 17,
+
+    //  File has been destroyed
+    FILE_DESTROYED: 18,
 
     TEXTURE_ATLAS_JSON_ARRAY: 20,
     TEXTURE_ATLAS_JSON_HASH: 21

src/loader/const.js

@@ -1,7 +1,7 @@
 var FileTypesManager = require('../FileTypesManager');
 var ImageFile = require('./ImageFile.js');
 var JSONFile = require('./JSONFile.js');
-var NumberArray = require('../utils/array/NumberArray');
+var NumberArray = require('../../utils/array/NumberArray');
 
 //  Phaser.Loader.FileTypes.MultiAtlas
 

src/loader/filetypes/MultiAtlas.js

@@ -2,10 +2,9 @@
 
 module.exports = {
 
-    BaseLoader: require('./BaseLoader'),
+    LoaderPlugin: require('./LoaderPlugin'),
     File: require('./File'),
     FileTypesManager: require('./FileTypesManager'),
-    LoaderPlugin: require('./Loader'),
 
     FileTypes: {
         AnimationJSONFile: require('./filetypes/AnimationJSONFile'),