Merge branch 'master' into rendering-cleanup

Author: bitnenfer

src/boot/Config.js

@@ -182,6 +182,18 @@ var Config = new Class({
         this.physics = GetValue(config, 'physics', {});
         this.defaultPhysicsSystem = GetValue(this.physics, 'default', false);
 
+        //  Loader Defaults
+        this.loaderBaseURL = GetValue(config, 'loader.baseURL', '');
+        this.loaderPath = GetValue(config, 'loader.path', '');
+        this.loaderEnableParallel = GetValue(config, 'loader.enableParallel', true);
+        this.loaderMaxParallelDownloads = GetValue(config, 'loader.maxParallelDownloads', 4);
+        this.loaderCrossOrigin = GetValue(config, 'loader.crossOrigin', undefined);
+        this.loaderResponseType = GetValue(config, 'loader.responseType', '');
+        this.loaderAsync = GetValue(config, 'loader.async', true);
+        this.loaderUser = GetValue(config, 'loader.user', '');
+        this.loaderPassword = GetValue(config, 'loader.password', '');
+        this.loaderTimeout = GetValue(config, 'loader.timeout', 0);
+
         //  Scene Plugins
         this.defaultPlugins = GetValue(config, 'plugins', DefaultScenePlugins);
 

src/boot/DebugHeader.js

@@ -20,7 +20,7 @@ var DebugHeader = function (game)
 
     var renderType = (config.renderType === CONST.CANVAS) ? 'Canvas' : 'WebGL';
 
-    var audioConfig = game.config.audio;
+    var audioConfig = config.audio;
     var deviceAudio = game.device.Audio;
 
     var audioType;
@@ -105,7 +105,7 @@ var DebugHeader = function (game)
     }
 
     // Keep this during dev build only
-    console.log(CHECKSUM.build);
+    // console.log(CHECKSUM.build);
 };
 
 module.exports = DebugHeader;

src/geom/point/index.js

@@ -14,6 +14,7 @@ Point.Floor = require('./Floor');
 Point.GetCentroid = require('./GetCentroid');
 Point.GetMagnitude = require('./GetMagnitude');
 Point.GetMagnitudeSq = require('./GetMagnitudeSq');
+Point.GetRectangleFromPoints = require('./GetRectangleFromPoints');
 Point.Interpolate = require('./Interpolate');
 Point.Invert = require('./Invert');
 Point.Multiply = require('./Multiply');

src/loader/File.js

@@ -48,6 +48,9 @@ var File = new Class({
             this.xhrSettings = MergeXHRSettings(this.xhrSettings, GetFastValue(fileConfig, 'xhrSettings', {}));
         }
 
+        //  The LoaderPlugin instance that is loading this file
+        this.loader = null;
+
         this.xhrLoader = null;
 
         this.state = CONST.FILE_PENDING;
@@ -70,8 +73,6 @@ var File = new Class({
         //  Multipart file? (i.e. an atlas and its json together)
         this.linkFile = undefined;
         this.linkType = '';
-
-        this.callback = null;
     },
 
     resetXHR: function ()
@@ -81,20 +82,54 @@ var File = new Class({
         this.xhrLoader.onprogress = undefined;
     },
 
-    //  Called when the Image loads
-    //  ProgressEvent
+    //  Called by the Loader, starts the actual file downloading.
+    //  During the load the methods onLoad, onProgress, etc are called based on the XHR events.
+    load: function (loader)
+    {
+        this.loader = loader;
+
+        if (this.state === CONST.FILE_POPULATED)
+        {
+            this.onComplete();
+
+            loader.nextFile(this);
+        }
+        else
+        {
+            this.src = GetURL(this, loader.baseURL);
+
+            if (this.src.indexOf('data:') === 0)
+            {
+                console.log('Local data URI');
+            }
+            else
+            {
+                this.xhrLoader = XHRLoader(this, loader.xhr);
+            }
+        }
+    },
+
+    //  Called when the file loads, is sent a DOM ProgressEvent
     onLoad: function (event)
     {
         this.resetXHR();
 
-        this.callback(this, true);
+        if (event.target && event.target.status !== 200)
+        {
+            this.loader.nextFile(this, false);
+        }
+        else
+        {
+            this.loader.nextFile(this, true);
+        }
     },
 
+    //  Called when the file errors, is sent a DOM ProgressEvent
     onError: function (event)
     {
         this.resetXHR();
 
-        this.callback(this, false);
+        this.loader.nextFile(this, false);
     },
 
     onProgress: function (event)
@@ -105,11 +140,14 @@ var File = new Class({
             this.bytesTotal = event.total;
 
             this.percentComplete = Math.min((this.bytesLoaded / this.bytesTotal), 1);
-        }
 
-        // console.log(this.percentComplete + '% (' + this.bytesLoaded + ' bytes)');
+            // console.log(this.percentComplete + '% (' + this.bytesLoaded + ' bytes)');
+            this.loader.emit('fileprogress', this, this.percentComplete);
+        }
     },
 
+    //  Usually overriden by the FileTypes and is called by Loader.finishedLoading.
+    //  The callback is Loader.processUpdate
     onProcess: function (callback)
     {
         this.state = CONST.FILE_PROCESSING;
@@ -139,25 +177,6 @@ var File = new Class({
         {
             this.state = CONST.FILE_COMPLETE;
         }
-    },
-
-    //  Called by the Loader, starts the actual file downloading
-    load: function (callback, baseURL, globalXHR)
-    {
-        if (baseURL === undefined) { baseURL = ''; }
-
-        this.callback = callback;
-
-        this.src = GetURL(this, baseURL);
-
-        if (this.src.indexOf('data:') === 0)
-        {
-            console.log('Local data URI');
-        }
-        else
-        {
-            this.xhrLoader = XHRLoader(this, globalXHR);
-        }
     }
 
 });

src/loader/FileTypesManager.js

@@ -0,0 +1,27 @@
+var types = {};
+
+var FileTypesManager = {
+
+    install: function (loader)
+    {
+        for (var key in types)
+        {
+            loader[key] = types[key];
+        }
+    },
+
+    register: function (key, factoryFunction)
+    {
+        types[key] = factoryFunction;
+
+        // console.log('FileTypesManager.register', key);
+    },
+
+    destroy: function ()
+    {
+        types = {};
+    }
+
+};
+
+module.exports = FileTypesManager;