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

Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source
This commit is contained in:
Mat Groves 2014-01-04 17:33:58 +00:00
commit 5aa76ac1d3
3 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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) ![pixi.js logo](http://www.goodboydigital.com/pixijs/logo_small.png)

12
src/pixi/display/DisplayObject.js
View file

@ -304,15 +304,14 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'interactive', {
*/ */
Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', { Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', {
get: function() { get: function() {
var item = this; var item = this;
do do
{ {
if(!item.visible)return false; if(!item.visible)return false;
item = item.parent; item = item.parent;
} }
while(item.parent); while(item && item.parent);
return true; return true;
} }
@ -327,11 +326,8 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', {
* @type Graphics * @type Graphics
*/ */
Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', { Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', {
get: function() { get: function() {
return this._mask; return this._mask;
}, },
set: function(value) { set: function(value) {
@ -369,8 +365,6 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', {
// TODO change this as it is legacy // TODO change this as it is legacy
this._filterBlock = {target:this, filterPasses:passes}; this._filterBlock = {target:this, filterPasses:passes};
} }
this._filters = value; this._filters = value;
@ -469,4 +463,4 @@ PIXI.DisplayObject.prototype._renderCanvas = function(renderSession)
PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0); PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0);
PIXI.visibleCount = 0; PIXI.visibleCount = 0;

10
src/pixi/display/Sprite.js
View file

@ -40,15 +40,6 @@ PIXI.Sprite = function(texture)
*/ */
this.texture = 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) * The width of the sprite (this is initially set by the texture)
* *
@ -88,7 +79,6 @@ PIXI.Sprite = function(texture)
if(texture.baseTexture.hasLoaded) if(texture.baseTexture.hasLoaded)
{ {
this.updateFrame = true;
this.onTextureUpdate(); this.onTextureUpdate();
} }
else else