diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index 8fad6da..d4b61e9 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-31 + * Compiled: 2014-01-01 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1314,7 +1314,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; @@ -4997,7 +4997,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -5070,11 +5073,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) @@ -5521,8 +5523,8 @@ var verticies = this.vertices; - width = sprite.texture.frame.width; - height = sprite.texture.frame.height; + var width = sprite.texture.frame.width; + var height = sprite.texture.frame.height; // TODO trim?? var aX = sprite.anchor.x; @@ -5656,8 +5658,8 @@ var verticies = this.vertices; - width = tilingSprite.width; - height = tilingSprite.height; + var width = tilingSprite.width; + var height = tilingSprite.height; // TODO trim?? var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index 8fad6da..d4b61e9 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-31 + * Compiled: 2014-01-01 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1314,7 +1314,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; @@ -4997,7 +4997,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -5070,11 +5073,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) @@ -5521,8 +5523,8 @@ var verticies = this.vertices; - width = sprite.texture.frame.width; - height = sprite.texture.frame.height; + var width = sprite.texture.frame.width; + var height = sprite.texture.frame.height; // TODO trim?? var aX = sprite.anchor.x; @@ -5656,8 +5658,8 @@ var verticies = this.vertices; - width = tilingSprite.width; - height = tilingSprite.height; + var width = tilingSprite.width; + var height = tilingSprite.height; // TODO trim?? var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x diff --git a/src/pixi/display/DisplayObjectContainer.js b/src/pixi/display/DisplayObjectContainer.js index 117b572..4436132 100644 --- a/src/pixi/display/DisplayObjectContainer.js +++ b/src/pixi/display/DisplayObjectContainer.js @@ -194,7 +194,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index 8fad6da..d4b61e9 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-31 + * Compiled: 2014-01-01 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1314,7 +1314,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; @@ -4997,7 +4997,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -5070,11 +5073,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) @@ -5521,8 +5523,8 @@ var verticies = this.vertices; - width = sprite.texture.frame.width; - height = sprite.texture.frame.height; + var width = sprite.texture.frame.width; + var height = sprite.texture.frame.height; // TODO trim?? var aX = sprite.anchor.x; @@ -5656,8 +5658,8 @@ var verticies = this.vertices; - width = tilingSprite.width; - height = tilingSprite.height; + var width = tilingSprite.width; + var height = tilingSprite.height; // TODO trim?? var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x diff --git a/src/pixi/display/DisplayObjectContainer.js b/src/pixi/display/DisplayObjectContainer.js index 117b572..4436132 100644 --- a/src/pixi/display/DisplayObjectContainer.js +++ b/src/pixi/display/DisplayObjectContainer.js @@ -194,7 +194,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 216be92..fd13e5a 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -83,7 +83,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -156,11 +159,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index 8fad6da..d4b61e9 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-31 + * Compiled: 2014-01-01 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1314,7 +1314,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; @@ -4997,7 +4997,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -5070,11 +5073,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) @@ -5521,8 +5523,8 @@ var verticies = this.vertices; - width = sprite.texture.frame.width; - height = sprite.texture.frame.height; + var width = sprite.texture.frame.width; + var height = sprite.texture.frame.height; // TODO trim?? var aX = sprite.anchor.x; @@ -5656,8 +5658,8 @@ var verticies = this.vertices; - width = tilingSprite.width; - height = tilingSprite.height; + var width = tilingSprite.width; + var height = tilingSprite.height; // TODO trim?? var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x diff --git a/src/pixi/display/DisplayObjectContainer.js b/src/pixi/display/DisplayObjectContainer.js index 117b572..4436132 100644 --- a/src/pixi/display/DisplayObjectContainer.js +++ b/src/pixi/display/DisplayObjectContainer.js @@ -194,7 +194,7 @@ */ PIXI.DisplayObjectContainer.prototype.updateTransform = function() { - this._currentBounds = null; + //this._currentBounds = null; if(!this.visible)return; diff --git a/src/pixi/renderers/webgl/WebGLRenderer.js b/src/pixi/renderers/webgl/WebGLRenderer.js index 216be92..fd13e5a 100644 --- a/src/pixi/renderers/webgl/WebGLRenderer.js +++ b/src/pixi/renderers/webgl/WebGLRenderer.js @@ -83,7 +83,10 @@ - this.projection = new PIXI.Point(400, 300); + this.projection = new PIXI.Point(); + this.projection.x = this.width/2; + this.projection.y = -this.height/2; + this.offset = new PIXI.Point(0, 0); this.resize(this.width, this.height); @@ -156,11 +159,10 @@ gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clear(gl.COLOR_BUFFER_BIT); + // this.projection.x = this.width/2; + //this.projection.y = -this.height/2; - this.projection.x = this.width/2; - this.projection.y = -this.height/2; - - this.renderDisplayObject( stage, this.projection); + this.renderDisplayObject( stage, this.projection ); // interaction if(stage.interactive) diff --git a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js index 11b9a96..678d518 100644 --- a/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js +++ b/src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js @@ -98,8 +98,8 @@ var verticies = this.vertices; - width = sprite.texture.frame.width; - height = sprite.texture.frame.height; + var width = sprite.texture.frame.width; + var height = sprite.texture.frame.height; // TODO trim?? var aX = sprite.anchor.x; @@ -233,8 +233,8 @@ var verticies = this.vertices; - width = tilingSprite.width; - height = tilingSprite.height; + var width = tilingSprite.width; + var height = tilingSprite.height; // TODO trim?? var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x