From bd5f5352b7f8b70d707fd0f46883e40ecb5485eb Mon Sep 17 00:00:00 2001 From: Stephen Murray Date: Sun, 7 Apr 2013 12:19:46 -0400 Subject: [PATCH] For texturepacker compatiblity, make sure 'frame' property exists before attempting to use it --- src/pixi/loaders/SpriteSheetLoader.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index 8db48fd..36152a6 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -69,16 +69,19 @@ PIXI.SpriteSheetLoader.prototype.onLoaded = function() for (var i in frameData) { var rect = frameData[i].frame; - PIXI.TextureCache[i] = new PIXI.Texture(this.texture, {x:rect.x, y:rect.y, width:rect.w, height:rect.h}); - - if(frameData[i].trimmed) + if (rect) { - //var realSize = frameData[i].spriteSourceSize; - PIXI.TextureCache[i].realSize = frameData[i].spriteSourceSize; - PIXI.TextureCache[i].trim.x = 0// (realSize.x / rect.w) - // calculate the offset! + PIXI.TextureCache[i] = new PIXI.Texture(this.texture, {x:rect.x, y:rect.y, width:rect.w, height:rect.h}); + + if(frameData[i].trimmed) + { + //var realSize = frameData[i].spriteSourceSize; + PIXI.TextureCache[i].realSize = frameData[i].spriteSourceSize; + PIXI.TextureCache[i].trim.x = 0// (realSize.x / rect.w) + // calculate the offset! + } + // this.frames[i] = ; } -// this.frames[i] = ; } if(this.texture.hasLoaded)