jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Issue Fixes

Browse source 
- fixed issue of cached images causing the assetloader to not call
onComplete
- Added check to Texture.setFrame to ensure frame is smaller than the
images size
This commit is contained in:
Mat Groves 2013-03-28 09:14:54 +00:00
parent 6bdcce9081
commit 30ffc476ad
4 changed files with 31 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
bin/pixi.dev.js
View file

@ -3369,6 +3369,11 @@ PIXI.Texture.prototype.setFrame = function(frame)
this.frame = frame;
this.width = frame.width;
this.height = frame.height;
if(frame.x + frame.width > this.baseTexture.width || frame.y + frame.height > this.baseTexture.height)
{
throw new Error("Texture Error: frame does not fit inside the base Texture dimensions " + this);
}
//this.updateFrame = true;
}
@ -3396,7 +3401,6 @@ PIXI.Texture.fromImage = function(imageUrl, crossorigin)
image.crossOrigin = '';
}
image.src = imageUrl;
baseTexture = new PIXI.BaseTexture(image);
PIXI.BaseTextureCache[imageUrl] = baseTexture;
}
@ -3669,7 +3673,7 @@ PIXI.AssetLoader.prototype.load = function()
{
var texture = PIXI.Texture.fromImage(filename, this.crossorigin);
if(!texture.hasLoaded)
if(!texture.baseTexture.hasLoaded)
{
var scope = this;
@ -3685,6 +3689,12 @@ PIXI.AssetLoader.prototype.load = function()
// already loaded!
this.loadCount--;
// if this hits zero here.. then everything was cached!
if(this.loadCount == 0)
{
this.dispatchEvent( { type: 'onComplete', content: this } );
if(this.onComplete)this.onComplete();
}
}
}