New Loader Events, and sorted out the const assignments.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'ada471e0-bbbc-11e6-8998-8541b7b364d1'
+build: 'b52ef110-bbc6-11e6-b803-3d5519c57e8c'
 };
 module.exports = CHECKSUM;

v3/src/events/EventBinding.js

@@ -131,6 +131,8 @@ EventBinding.prototype = {
 
     dispatch: function (event)
     {
+        console.log('EventBinding.dispatch', this.active.length);
+
         if (this.state !== CONST.DISPATCHER_IDLE)
         {
             throw new Error('Error: Failed to execute \'EventDispatcher.dispatch\' on \'' + this.type + '\': The event is already being dispatched.');

v3/src/events/EventDispatcher.js

@@ -40,6 +40,8 @@ EventDispatcher.prototype = {
             binding.add(listener, priority, false);
         }
 
+        console.log('on', binding);
+
         return this;
     },
 
@@ -120,6 +122,8 @@ EventDispatcher.prototype = {
 
     _dispatchHandler: function (event)
     {
+        console.log('_dispatchHandler', event.type);
+
         event.reset(this);
 
         //  Pass the event through the filters first
@@ -140,6 +144,9 @@ EventDispatcher.prototype = {
 
         var binding = this.getBinding(event.type);
 
+        console.log('_dispatchHandler', binding);
+        console.dir(this.bindings);
+
         if (binding)
         {
             binding.dispatch(event);

v3/src/loader/BaseLoader.js

@@ -1,8 +1,9 @@
 
-var FILE_CONST = require('./const');
+var CONST = require('./const');
 var Set = require('../structs/Set');
 var XHRSettings = require('./XHRSettings');
-var Events = require('./events/');
+var Event = require('./events/');
+var EventDispatcher = require('../events/EventDispatcher');
 
 var BaseLoader = function ()
 {
@@ -16,6 +17,7 @@ var BaseLoader = function ()
     //  6) Multi File support (atlas + data)
     //  7) Atlas Loader
 
+    this.events = new EventDispatcher();
 
     //  Move to a 'setURL' method?
     this.baseURL = '';
@@ -37,7 +39,7 @@ var BaseLoader = function ()
 
     this.storage = new Set();
 
-    this._state = 'PENDING';
+    this._state = CONST.LOADER_IDLE;
 };
 
 BaseLoader.prototype.contructor = BaseLoader;
@@ -73,13 +75,13 @@ BaseLoader.prototype = {
     //  Is the Loader actively loading (or processing loaded files)
     isLoading: function ()
     {
-        return (this._state === 'LOADING' || this._state === 'PROCESSING');
+        return (this._state === CONST.LOADER_LOADING || this._state === CONST.LOADER_PROCESSING);
     },
 
     //  Is the Loader ready to start a new load?
     isReady: function ()
     {
-        return (this._state === 'PENDING' || this._state === 'COMPLETE' || this._state === 'FAILED');
+        return (this._state === CONST.LOADER_IDLE || this._state === CONST.LOADER_COMPLETE || this._state === CONST.LOADER_FAILED);
     },
 
     start: function ()
@@ -91,15 +93,15 @@ BaseLoader.prototype = {
             return;
         }
 
-        this.state.sys.events.dispatch(new Events.LOADER_START_EVENT(this));
+        this.events.dispatch(new Event.LOADER_START_EVENT(this));
 
         if (this.list.size === 0)
         {
             this.finishedLoading();
         }
         else
         {
-            // this.state = LOADING;
+            this._state = CONST.LOADER_LOADING;
 
             this.failed.clear();
             this.inflight.clear();
@@ -124,7 +126,7 @@ BaseLoader.prototype = {
 
         this.list.each(function (file)
         {
-            if (file.state === FILE_CONST.PENDING && _this.inflight.size < _this.maxParallelDownloads)
+            if (file.state === CONST.FILE_PENDING && _this.inflight.size < _this.maxParallelDownloads)
             {
                 console.log('ADDED TO QUEUE:', file.key);
 
@@ -193,7 +195,7 @@ BaseLoader.prototype = {
     {
         console.log('BaseLoader.finishedLoading PROCESSING');
 
-        this.state = 'PROCESSING';
+        this._state = CONST.LOADER_PROCESSING;
 
         var storage = this.storage;
 
@@ -223,11 +225,11 @@ BaseLoader.prototype = {
 
         console.log('Loader Complete. Loaded:', storage.size, 'Failed:', this.failed.size);
 
-        console.log('BaseLoader COMPLETE');
+        console.log('BaseLoader COMPLETE - dispatching event');
 
-        this.state = 'COMPLETE';
+        this._state = CONST.LOADER_COMPLETE;
 
-        //  Dispatch 'on complete' signals now
+        this.events.dispatch(new Event.LOADER_COMPLETE_EVENT(this));
     },
 
     getLoadedFiles (group = '', output = []) {
@@ -260,13 +262,13 @@ BaseLoader.prototype = {
         this.path = '';
         this.baseURL = '';
 
-        this.state = 'PENDING';
+        this._state = CONST.LOADER_IDLE;
     },
 
     destroy: function ()
     {
         this.reset();
-        this.state = 'DESTROYED';
+        this._state = CONST.LOADER_DESTROYED;
     }
 
 };

v3/src/loader/File.js

@@ -1,5 +1,5 @@
 var GetURL = require('./GetURL');
-var FILE_CONST = require('./const');
+var CONST = require('./const');
 var XHRLoader = require('./XHRLoader');
 var XHRSettings = require('./XHRSettings');
 
@@ -21,7 +21,7 @@ var File = function (type, key, url, responseType)
 
     this.xhrLoader = null;
 
-    this.state = FILE_CONST.PENDING;
+    this.state = CONST.FILE_PENDING;
 
     //  Set by onProgress (if loading via XHR)
     this.bytesTotal = 0;

v3/src/loader/const.js

@@ -1,12 +1,18 @@
 var FILE_CONST = {
 
-    PENDING: 0,      // file is in the load queue but not yet started
-    LOADING: 1,      // file has been started to load by the loader (onLoad called)
-    LOADED: 2,       // file has loaded successfully, awaiting processing
-    FAILED: 3,       // file failed to load
-    PROCESSING: 4,   // file is being processed (onProcess callback)
-    COMPLETE: 5,     // file has finished processing
-    DESTROYED: 6     // file has been destroyed
+    LOADER_IDLE: 0,
+    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_COMPLETE: 10,     // file has finished processing
+    FILE_DESTROYED: 11     // file has been destroyed
 
 };
 

v3/src/loader/events/LoaderCompleteEvent.js

@@ -0,0 +1,13 @@
+var Event = require('../../events/Event');
+
+var LoaderCompleteEvent = function (loader)
+{
+    Event.call(this, 'LOADER_COMPLETE_EVENT');
+
+    this.loader = loader;
+};
+
+LoaderCompleteEvent.prototype = Object.create(Event.prototype);
+LoaderCompleteEvent.prototype.constructor = LoaderCompleteEvent;
+
+module.exports = LoaderCompleteEvent;

v3/src/loader/events/LoaderStartEvent.js

@@ -2,7 +2,7 @@ var Event = require('../../events/Event');
 
 var LoaderStartEvent = function (loader)
 {
-    Event.call(this);
+    Event.call(this, 'LOADER_START_EVENT');
 
     this.loader = loader;
 };

v3/src/loader/events/index.js

@@ -1,5 +1,6 @@
 module.exports = {
 
-    LOADER_START_EVENT: require('./LoaderStartEvent')
+    LOADER_START_EVENT: require('./LoaderStartEvent'),
+    LOADER_COMPLETE_EVENT: require('./LoaderCompleteEvent')
 
 };

v3/src/state/StateManager.js

@@ -10,6 +10,7 @@ var State = require('./State');
 var Settings = require('./Settings');
 var Systems = require('./Systems');
 var GetObjectValue = require('../utils/GetObjectValue');
+var LoaderEvent = require('../loader/events/');
 
 /**
 * The State Manager is responsible for loading, setting up and switching game states.
@@ -360,33 +361,37 @@ StateManager.prototype = {
                 //  Is the loader empty?
                 if (state.sys.load.list.size === 0)
                 {
-                    console.log('empty queue');
+                    console.log('Loader: Empty queue');
                     this.startCreate(state);
                 }
                 else
                 {
-                    console.log('load start');
+                    console.log('-------------------> Loader: Start');
 
                     //  Start the loader going as we have something in the queue
-                    // state.load.onLoadComplete.addOnce(this.loadComplete, this, 0, state);
+
+                    state.sys.load.events.on('LOADER_COMPLETE_EVENT', this.loadComplete.bind(this));
 
                     state.sys.load.start();
                 }
             }
             else
             {
-                console.log('no preload');
-
                 //  No preload? Then there was nothing to load either
                 this.startCreate(state);
             }
 
         }
     },
 
-    loadComplete: function (state)
+    loadComplete: function (event)
     {
-        console.log('loadComplete');
+        console.log('Loader: Complete');
+        console.log(arguments);
+
+        var state = event.loader.state;
+
+        console.log(state);
 
         //  Make sure to do load-update one last time before state is set to _created