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

Fixed cross domain bug

Browse source
This commit is contained in:
Mat Groves 2014-03-04 21:03:51 +00:00
parent 73d3bc0e11
commit 138c3b11d0
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
bin/pixi.dev.js
View file

@ -4,7 +4,7 @@
* Copyright (c) 2012-2014, Mat Groves
* http://goodboydigital.com/
*
* Compiled: 2014-03-01
* Compiled: 2014-03-04
*
* pixi.js is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license.php
@ -1937,7 +1937,7 @@ PIXI.Sprite.prototype._renderCanvas = function(renderSession)
// allow for trimming
if (renderSession.roundPixels)
{
context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx || 0, transform.ty || 0);
context.setTransform(transform.a, transform.c, transform.b, transform.d, transform.tx | 0, transform.ty | 0);
}
else
{
@ -2210,7 +2210,7 @@ PIXI.SpriteBatch.prototype._renderCanvas = function(renderSession)
if (renderSession.roundPixels)
{
context.setTransform(childTransform.a, childTransform.c, childTransform.b, childTransform.d, childTransform.tx || 0, childTransform.ty || 0);
context.setTransform(childTransform.a, childTransform.c, childTransform.b, childTransform.d, childTransform.tx | 0, childTransform.ty | 0);
}
else
{
@ -11805,7 +11805,6 @@ PIXI.BaseTexture.prototype.updateSourceImage = function(newSrc)
PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
{
var baseTexture = PIXI.BaseTextureCache[imageUrl];
crossorigin = !crossorigin;
if(!baseTexture)
{

6
bin/pixi.js
View file

File diff suppressed because one or more lines are too long

1
src/pixi/textures/BaseTexture.js
View file

@ -149,7 +149,6 @@ PIXI.BaseTexture.prototype.updateSourceImage = function(newSrc)
PIXI.BaseTexture.fromImage = function(imageUrl, crossorigin, scaleMode)
{
var baseTexture = PIXI.BaseTextureCache[imageUrl];
crossorigin = !crossorigin;
if(!baseTexture)
{