diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js index fc0a28e..ad7f09c 100644 --- a/src/core/textures/Texture.js +++ b/src/core/textures/Texture.js @@ -20,7 +20,6 @@ */ function Texture(baseTexture, frame, crop, trim, rotate) { - console.log(trim, frame, crop, "......") /** * Does this Texture have any frame data assigned to it? * diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js index fc0a28e..ad7f09c 100644 --- a/src/core/textures/Texture.js +++ b/src/core/textures/Texture.js @@ -20,7 +20,6 @@ */ function Texture(baseTexture, frame, crop, trim, rotate) { - console.log(trim, frame, crop, "......") /** * Does this Texture have any frame data assigned to it? * diff --git a/src/loaders/index.js b/src/loaders/index.js index a3a8db4..5063bab 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -9,8 +9,8 @@ * @namespace PIXI */ module.exports = { - Loader: require('resource-loader'), - loader: require('./loader'), + // Loader: require('resource-loader'), + Loader: require('./Loader'), // parsers bitmapFontParser: require('./bitmapFontParser'), diff --git a/src/core/textures/Texture.js b/src/core/textures/Texture.js index fc0a28e..ad7f09c 100644 --- a/src/core/textures/Texture.js +++ b/src/core/textures/Texture.js @@ -20,7 +20,6 @@ */ function Texture(baseTexture, frame, crop, trim, rotate) { - console.log(trim, frame, crop, "......") /** * Does this Texture have any frame data assigned to it? * diff --git a/src/loaders/index.js b/src/loaders/index.js index a3a8db4..5063bab 100644 --- a/src/loaders/index.js +++ b/src/loaders/index.js @@ -9,8 +9,8 @@ * @namespace PIXI */ module.exports = { - Loader: require('resource-loader'), - loader: require('./loader'), + // Loader: require('resource-loader'), + Loader: require('./Loader'), // parsers bitmapFontParser: require('./bitmapFontParser'), diff --git a/src/loaders/loader.js b/src/loaders/loader.js index 00f7473..bcab9c8 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -1,16 +1,19 @@ -var Loader = require('resource-loader'), +var ResourceLoader = require('resource-loader'), textureParser = require('./textureParser'), spritesheetParser = require('./spritesheetParser'), spineAtlasParser = require('./spineAtlasParser'), - bitmapFontParser = require('./bitmapFontParser'), - loader = new Loader(); + bitmapFontParser = require('./bitmapFontParser') + // loader = new Loader(); -loader - // parse any json strings into objects - .use(Loader.middleware.parsing.json()) +var Loader = function() +{ + ResourceLoader.call(this); + + // parse any json strings into objects + this.use(ResourceLoader.middleware.parsing.json()) // parse any blob into more usable objects (e.g. Image) - .use(Loader.middleware.parsing.blob()) + .use(ResourceLoader.middleware.parsing.blob()) // parse any Image objects into textures .use(textureParser()) @@ -23,5 +26,9 @@ // parse any spritesheet data into multiple textures .use(bitmapFontParser()); +} -module.exports = loader; +Loader.prototype = Object.create(ResourceLoader.prototype); +Loader.prototype.constructor = Loader; + +module.exports = Loader;