diff --git a/src/loaders/loader.js b/src/loaders/loader.js index b1d9c1d..4c6e1b1 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -11,6 +11,6 @@ // parse any Image objects into textures .use(textureParser()) // parse any spritesheet data into multiple textures - .use(spritesheetParser()) + .use(spritesheetParser()); module.exports = loader; diff --git a/src/loaders/loader.js b/src/loaders/loader.js index b1d9c1d..4c6e1b1 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -11,6 +11,6 @@ // parse any Image objects into textures .use(textureParser()) // parse any spritesheet data into multiple textures - .use(spritesheetParser()) + .use(spritesheetParser()); module.exports = loader; diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 22d41e6..934e1d7 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -30,7 +30,7 @@ var trim = null; // Check to see if the sprite is trimmed - if (frameData[i].trimmed) + if (frames[i].trimmed) { trim = new core.math.Rectangle( frames[i].spriteSourceSize.x, @@ -40,7 +40,7 @@ ); } - cresource.textures[i] = new core.Texture(resource.texture.baseTexture, size, size.clone(), trim); + resource.textures[i] = new core.Texture(res.texture.baseTexture, size, size.clone(), trim); } } diff --git a/src/loaders/loader.js b/src/loaders/loader.js index b1d9c1d..4c6e1b1 100644 --- a/src/loaders/loader.js +++ b/src/loaders/loader.js @@ -11,6 +11,6 @@ // parse any Image objects into textures .use(textureParser()) // parse any spritesheet data into multiple textures - .use(spritesheetParser()) + .use(spritesheetParser()); module.exports = loader; diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 22d41e6..934e1d7 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -30,7 +30,7 @@ var trim = null; // Check to see if the sprite is trimmed - if (frameData[i].trimmed) + if (frames[i].trimmed) { trim = new core.math.Rectangle( frames[i].spriteSourceSize.x, @@ -40,7 +40,7 @@ ); } - cresource.textures[i] = new core.Texture(resource.texture.baseTexture, size, size.clone(), trim); + resource.textures[i] = new core.Texture(res.texture.baseTexture, size, size.clone(), trim); } } diff --git a/src/loaders/textureParser.js b/src/loaders/textureParser.js index 53d034a..9b3d2d5 100644 --- a/src/loaders/textureParser.js +++ b/src/loaders/textureParser.js @@ -1,5 +1,4 @@ -var Resource = require('asset-loader').Resource, - core = require('../core'); +var core = require('../core'); module.exports = function () {