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

Fixed issue where local variable width and height were in global scope

Browse source
This commit is contained in:
Mat Groves 2014-01-01 12:17:34 +00:00
parent 6d7f206a2b
commit 2debc70e3f
4 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

24
bin/pixi.dev.js
View file

@ -4,7 +4,7 @@
* Copyright (c) 2012, Mat Groves * Copyright (c) 2012, Mat Groves
* http://goodboydigital.com/ * http://goodboydigital.com/
* *
* Compiled: 2013-12-31 * Compiled: 2014-01-01
* *
* Pixi.JS is licensed under the MIT License. * Pixi.JS is licensed under the MIT License.
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
@ -1314,7 +1314,7 @@ PIXI.DisplayObjectContainer.prototype.removeChild = function(child)
*/ */
PIXI.DisplayObjectContainer.prototype.updateTransform = function() PIXI.DisplayObjectContainer.prototype.updateTransform = function()
{ {
this._currentBounds = null; //this._currentBounds = null;
if(!this.visible)return; if(!this.visible)return;
@ -4997,7 +4997,10 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
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.offset = new PIXI.Point(0, 0);
this.resize(this.width, this.height); this.resize(this.width, this.height);
@ -5070,11 +5073,10 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent);
gl.clear(gl.COLOR_BUFFER_BIT); 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.renderDisplayObject( stage, this.projection );
this.projection.y = -this.height/2;
this.renderDisplayObject( stage, this.projection);
// interaction // interaction
if(stage.interactive) if(stage.interactive)
@ -5521,8 +5523,8 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
var verticies = this.vertices; var verticies = this.vertices;
width = sprite.texture.frame.width; var width = sprite.texture.frame.width;
height = sprite.texture.frame.height; var height = sprite.texture.frame.height;
// TODO trim?? // TODO trim??
var aX = sprite.anchor.x; var aX = sprite.anchor.x;
@ -5656,8 +5658,8 @@ PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function(tilingSprite)
var verticies = this.vertices; var verticies = this.vertices;
width = tilingSprite.width; var width = tilingSprite.width;
height = tilingSprite.height; var height = tilingSprite.height;
// TODO trim?? // TODO trim??
var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x

2
src/pixi/display/DisplayObjectContainer.js
View file

@ -194,7 +194,7 @@ PIXI.DisplayObjectContainer.prototype.removeChild = function(child)
*/ */
PIXI.DisplayObjectContainer.prototype.updateTransform = function() PIXI.DisplayObjectContainer.prototype.updateTransform = function()
{ {
this._currentBounds = null; //this._currentBounds = null;
if(!this.visible)return; if(!this.visible)return;

12
src/pixi/renderers/webgl/WebGLRenderer.js
View file

@ -83,7 +83,10 @@ PIXI.WebGLRenderer = function(width, height, view, transparent, antialias)
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.offset = new PIXI.Point(0, 0);
this.resize(this.width, this.height); this.resize(this.width, this.height);
@ -156,11 +159,10 @@ PIXI.WebGLRenderer.prototype.render = function(stage)
gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent); gl.clearColor(stage.backgroundColorSplit[0],stage.backgroundColorSplit[1],stage.backgroundColorSplit[2], !this.transparent);
gl.clear(gl.COLOR_BUFFER_BIT); 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.renderDisplayObject( stage, this.projection );
this.projection.y = -this.height/2;
this.renderDisplayObject( stage, this.projection);
// interaction // interaction
if(stage.interactive) if(stage.interactive)

8
src/pixi/renderers/webgl/utils/WebGLSpriteBatch.js
View file

@ -98,8 +98,8 @@ PIXI.WebGLSpriteBatch.prototype.render = function(sprite)
var verticies = this.vertices; var verticies = this.vertices;
width = sprite.texture.frame.width; var width = sprite.texture.frame.width;
height = sprite.texture.frame.height; var height = sprite.texture.frame.height;
// TODO trim?? // TODO trim??
var aX = sprite.anchor.x; var aX = sprite.anchor.x;
@ -233,8 +233,8 @@ PIXI.WebGLSpriteBatch.prototype.renderTilingSprite = function(tilingSprite)
var verticies = this.vertices; var verticies = this.vertices;
width = tilingSprite.width; var width = tilingSprite.width;
height = tilingSprite.height; var height = tilingSprite.height;
// TODO trim?? // TODO trim??
var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x var aX = tilingSprite.anchor.x; // - tilingSprite.texture.trim.x