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) 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) diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 17dae50..2abd396 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -304,15 +304,14 @@ */ 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; } @@ -327,11 +326,8 @@ * @type Graphics */ Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', { - get: function() { - return this._mask; - }, set: function(value) { @@ -369,8 +365,6 @@ // TODO change this as it is legacy this._filterBlock = {target:this, filterPasses:passes}; - - } this._filters = value; @@ -469,4 +463,4 @@ PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0); -PIXI.visibleCount = 0; \ No newline at end of file +PIXI.visibleCount = 0; 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) diff --git a/src/pixi/display/DisplayObject.js b/src/pixi/display/DisplayObject.js index 17dae50..2abd396 100644 --- a/src/pixi/display/DisplayObject.js +++ b/src/pixi/display/DisplayObject.js @@ -304,15 +304,14 @@ */ 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; } @@ -327,11 +326,8 @@ * @type Graphics */ Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', { - get: function() { - return this._mask; - }, set: function(value) { @@ -369,8 +365,6 @@ // TODO change this as it is legacy this._filterBlock = {target:this, filterPasses:passes}; - - } this._filters = value; @@ -469,4 +463,4 @@ PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0); -PIXI.visibleCount = 0; \ No newline at end of file +PIXI.visibleCount = 0; diff --git a/src/pixi/display/Sprite.js b/src/pixi/display/Sprite.js index 9dfad4a..a609f18 100644 --- a/src/pixi/display/Sprite.js +++ b/src/pixi/display/Sprite.js @@ -41,15 +41,6 @@ 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) * * @property _width @@ -88,7 +79,6 @@ if(texture.baseTexture.hasLoaded) { - this.updateFrame = true; this.onTextureUpdate(); } else