Updated File Types to use config object instead.

Author: photonstorm

v3/src/checksum.js

@@ -1,4 +1,4 @@
 var CHECKSUM = {
-build: 'dfe80200-6000-11e7-a426-abaf4c1292d1'
+build: '752ee830-6009-11e7-ad20-7b53f4549f8a'
 };
 module.exports = CHECKSUM;

v3/src/loader/File.js

@@ -1,4 +1,5 @@
 var Class = require('../utils/Class');
+var GetFastValue = require('../utils/object/GetFastValue');
 var CONST = require('./const');
 var GetURL = require('./GetURL');
 var MergeXHRSettings = require('./MergeXHRSettings');
@@ -11,25 +12,40 @@ var File = new Class({
 
     initialize:
 
-    function File (type, key, url, responseType, xhrSettings, config)
+    // old signature: type, key, url, responseType, xhrSettings, config
+    function File (fileConfig)
     {
         //  file type (image, json, etc) for sorting within the Loader
-        this.type = type;
+        this.type = GetFastValue(fileConfig, 'type', false);
 
         //  unique cache key (unique within its file type)
-        this.key = key;
+        this.key = GetFastValue(fileConfig, 'key', false);
+
+        if (!this.type || !this.key)
+        {
+            throw new Error('Error calling \'Loader.' + this.type + '\' invalid key provided.');
+        }
 
         //  The URL of the file, not including baseURL
-        this.url = url;
+        this.url = GetFastValue(fileConfig, 'url', '');
+
+        if (this.url === '')
+        {
+            this.url = GetFastValue(fileConfig, 'path', '') + this.key + GetFastValue(fileConfig, 'extension', '');
+        }
+        else
+        {
+            this.url = GetFastValue(fileConfig, 'path', '').concat(this.url);
+        }
 
         //  Set when the Loader calls 'load' on this file
         this.src = '';
 
-        this.xhrSettings = XHRSettings(responseType);
+        this.xhrSettings = XHRSettings(GetFastValue(fileConfig, 'responseType', undefined));
 
-        if (xhrSettings)
+        if (GetFastValue(fileConfig, 'xhrSettings', false))
         {
-            this.xhrSettings = MergeXHRSettings(this.xhrSettings, xhrSettings);
+            this.xhrSettings = MergeXHRSettings(this.xhrSettings, GetFastValue(fileConfig, 'xhrSettings', {}));
         }
 
         this.xhrLoader = null;
@@ -49,7 +65,7 @@ var File = new Class({
         this.data = undefined;
 
         //  A config object that can be used by file types to store transitional data
-        this.config = config || {};
+        this.config = GetFastValue(fileConfig, 'config', {});
 
         //  Multipart file? (i.e. an atlas and its json together)
         this.linkFile = undefined;

v3/src/loader/filetypes/BinaryFile.js

@@ -12,23 +12,17 @@ var BinaryFile = new Class({
 
     function BinaryFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.binary\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.bin';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        File.call(this, 'binary', key, url, 'arraybuffer', xhrSettings);
+        var fileConfig = {
+            type: 'binary',
+            extension: 'bin',
+            responseType: 'arraybuffer',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
+
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/GLSLFile.js

@@ -12,23 +12,17 @@ var GLSLFile = new Class({
 
     function GLSLFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.glsl\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.glsl';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        File.call(this, 'glsl', key, url, 'text', xhrSettings);
+        var fileConfig = {
+            type: 'glsl',
+            extension: 'glsl',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
+
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/HTMLFile.js

@@ -14,28 +14,22 @@ var HTMLFile = new Class({
     {
         if (width === undefined) { width = 512; }
         if (height === undefined) { height = 512; }
-        if (path === undefined) { path = ''; }
 
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.html\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.html';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        var config = {
-            width: width,
-            height: height
+        var fileConfig = {
+            type: 'html',
+            extension: 'html',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings,
+            config: {
+                width: width,
+                height: height
+            }
         };
 
-        File.call(this, 'html', key, url, 'text', xhrSettings, config);
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/ImageFile.js

@@ -12,23 +12,18 @@ var ImageFile = new Class({
 
     function ImageFile (key, url, path, xhrSettings, config)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.image\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.png';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
+        var fileConfig = {
+            type: 'image',
+            extension: 'png',
+            responseType: 'blob',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings,
+            config: config
+        };
 
-        File.call(this, 'image', key, url, 'blob', xhrSettings, config);
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/JSONFile.js

@@ -12,23 +12,17 @@ var JSONFile = new Class({
 
     function JSONFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.json\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.json';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        File.call(this, 'json', key, url, 'text', xhrSettings);
+        var fileConfig = {
+            type: 'json',
+            extension: 'json',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
+
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/SVGFile.js

@@ -12,23 +12,17 @@ var SVGFile = new Class({
 
     function SVGFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.svg\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.svg';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
+        var fileConfig = {
+            type: 'svg',
+            extension: 'svg',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
 
-        File.call(this, 'svg', key, url, 'text', xhrSettings);
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/TextFile.js

@@ -12,23 +12,17 @@ var TextFile = new Class({
 
     function TextFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.txt\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.txt';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        File.call(this, 'txt', key, url, 'text', xhrSettings);
+        var fileConfig = {
+            type: 'text',
+            extension: 'txt',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
+
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)

v3/src/loader/filetypes/XMLFile.js

@@ -13,23 +13,17 @@ var XMLFile = new Class({
 
     function XMLFile (key, url, path, xhrSettings)
     {
-        if (path === undefined) { path = ''; }
-
-        if (!key)
-        {
-            throw new Error('Error calling \'Loader.xml\' invalid key provided.');
-        }
-
-        if (!url)
-        {
-            url = path + key + '.xml';
-        }
-        else
-        {
-            url = path.concat(url);
-        }
-
-        File.call(this, 'xml', key, url, 'text', xhrSettings);
+        var fileConfig = {
+            type: 'xml',
+            extension: 'xml',
+            responseType: 'text',
+            key: key,
+            url: url,
+            path: path,
+            xhrSettings: xhrSettings
+        };
+
+        File.call(this, fileConfig);
     },
 
     onProcess: function (callback)