diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 17072c6..5e3fbf3 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -23,6 +23,8 @@ this.assetURLs = assetURLs; this.assets = []; + + this.crossorigin = false; } /** @@ -79,7 +81,7 @@ if(type == "img") { - var texture = PIXI.Texture.fromImage(filename); + var texture = PIXI.Texture.fromImage(filename, this.crossorigin); if(!texture.hasLoaded) { @@ -102,6 +104,7 @@ else if(type == "atlas") { var spriteSheetLoader = new PIXI.SpriteSheetLoader(filename); + spriteSheetLoader.crossorigin = this.crossorigin; this.assets.push(spriteSheetLoader); var scope = this; diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 17072c6..5e3fbf3 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -23,6 +23,8 @@ this.assetURLs = assetURLs; this.assets = []; + + this.crossorigin = false; } /** @@ -79,7 +81,7 @@ if(type == "img") { - var texture = PIXI.Texture.fromImage(filename); + var texture = PIXI.Texture.fromImage(filename, this.crossorigin); if(!texture.hasLoaded) { @@ -102,6 +104,7 @@ else if(type == "atlas") { var spriteSheetLoader = new PIXI.SpriteSheetLoader(filename); + spriteSheetLoader.crossorigin = this.crossorigin; this.assets.push(spriteSheetLoader); var scope = this; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index f2c97f6..8db48fd 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -27,7 +27,8 @@ this.url = url; this.baseUrl = url.replace(/[^\/]*$/, ''); this.texture; - this.frames = {}; + this.frames = {}; + this.crossorigin = false; } // constructor @@ -60,7 +61,7 @@ var textureUrl = this.baseUrl + jsondata.meta.image; - this.texture = PIXI.Texture.fromImage(textureUrl).baseTexture; + this.texture = PIXI.Texture.fromImage(textureUrl, this.crossorigin).baseTexture; // if(!this.texture)this.texture = new PIXI.Texture(textureUrl); diff --git a/src/pixi/loaders/AssetLoader.js b/src/pixi/loaders/AssetLoader.js index 17072c6..5e3fbf3 100644 --- a/src/pixi/loaders/AssetLoader.js +++ b/src/pixi/loaders/AssetLoader.js @@ -23,6 +23,8 @@ this.assetURLs = assetURLs; this.assets = []; + + this.crossorigin = false; } /** @@ -79,7 +81,7 @@ if(type == "img") { - var texture = PIXI.Texture.fromImage(filename); + var texture = PIXI.Texture.fromImage(filename, this.crossorigin); if(!texture.hasLoaded) { @@ -102,6 +104,7 @@ else if(type == "atlas") { var spriteSheetLoader = new PIXI.SpriteSheetLoader(filename); + spriteSheetLoader.crossorigin = this.crossorigin; this.assets.push(spriteSheetLoader); var scope = this; diff --git a/src/pixi/loaders/SpriteSheetLoader.js b/src/pixi/loaders/SpriteSheetLoader.js index f2c97f6..8db48fd 100644 --- a/src/pixi/loaders/SpriteSheetLoader.js +++ b/src/pixi/loaders/SpriteSheetLoader.js @@ -27,7 +27,8 @@ this.url = url; this.baseUrl = url.replace(/[^\/]*$/, ''); this.texture; - this.frames = {}; + this.frames = {}; + this.crossorigin = false; } // constructor @@ -60,7 +61,7 @@ var textureUrl = this.baseUrl + jsondata.meta.image; - this.texture = PIXI.Texture.fromImage(textureUrl).baseTexture; + this.texture = PIXI.Texture.fromImage(textureUrl, this.crossorigin).baseTexture; // if(!this.texture)this.texture = new PIXI.Texture(textureUrl); diff --git a/src/pixi/textures/Texture.js b/src/pixi/textures/Texture.js index f1e7d34..ddea852 100644 --- a/src/pixi/textures/Texture.js +++ b/src/pixi/textures/Texture.js @@ -94,7 +94,7 @@ * @param imageUrl {String} The image url of the texture * @return Texture */ -PIXI.Texture.fromImage = function(imageUrl) +PIXI.Texture.fromImage = function(imageUrl, crossorigin) { var texture = PIXI.TextureCache[imageUrl]; @@ -104,6 +104,10 @@ if(!baseTexture) { var image = new Image();//new Image(); + if (crossorigin) + { + image.crossOrigin = ''; + } image.src = imageUrl; baseTexture = new PIXI.BaseTexture(image);