From eb72033534fe49228cc056b16430e0b7117574e5 Mon Sep 17 00:00:00 2001 From: SowingSadness Date: Fri, 3 Jan 2014 17:35:25 -0800 Subject: [PATCH 1/4] Update Sprite.js - delete duplicate ``` this.blendMode = PIXI.blendModes.NORMAL; ``` --- src/pixi/display/Sprite.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 9dfad4a..3ebed2f 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -40,15 +40,6 @@ PIXI.Sprite = function(texture) */ this.texture = texture; - /** - * The blend mode of sprite. - * currently supports PIXI.blendModes.NORMAL and PIXI.blendModes.SCREEN - * - * @property blendMode - * @type Number - */ - this.blendMode = PIXI.blendModes.NORMAL; - /** * The width of the sprite (this is initially set by the texture) * From 9cfc205af490e4c84d9a1b648f4b695d7e1ff068 Mon Sep 17 00:00:00 2001 From: SowingSadness Date: Fri, 3 Jan 2014 17:49:35 -0800 Subject: [PATCH 2/4] Update Sprite.js this.updateFrame = true; will be set in onTextureUpdate method --- src/pixi/display/Sprite.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 9dfad4a..ba4f7eb 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -88,7 +88,6 @@ PIXI.Sprite = function(texture) if(texture.baseTexture.hasLoaded) { - this.updateFrame = true; this.onTextureUpdate(); } else From 4c62e8fc167b24a44440ed33f55c4f36f088aa31 Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Fri, 3 Jan 2014 22:07:40 -0800 Subject: [PATCH 3/4] fix issue with worldVisible on Stage --- src/pixi/display/DisplayObject.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 76cacac..50fa1c9 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -303,15 +303,14 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'interactive', { */ Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', { get: function() { - var item = this; - + do { if(!item.visible)return false; item = item.parent; } - while(item.parent); + while(item && item.parent); return true; } @@ -326,11 +325,8 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', { * @type Graphics */ Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', { - get: function() { - return this._mask; - }, set: function(value) { @@ -368,8 +364,6 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', { // TODO change this as it is legacy this._filterBlock = {target:this, filterPasses:passes}; - - } this._filters = value; @@ -453,4 +447,4 @@ PIXI.DisplayObject.prototype._renderCanvas = function(renderSession) PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0); -PIXI.visibleCount = 0; \ No newline at end of file +PIXI.visibleCount = 0; From 71a0b0bd4999a26db8b02612283fca332ffc0757 Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Fri, 3 Jan 2014 22:18:11 -0800 Subject: [PATCH 4/4] Add build status to README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5ec43a..e070899 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Pixi Renderer +Pixi Renderer [![Build Status](https://travis-ci.org/GoodBoyDigital/pixi.js.png?branch=dev)](https://travis-ci.org/GoodBoyDigital/pixi.js) ============= ![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png)