Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev
This commit is contained in:
commit
5aa76ac1d3
3 changed files with 4 additions and 20 deletions
|
@ -1,4 +1,4 @@
|
|||
Pixi Renderer
|
||||
Pixi Renderer [](https://travis-ci.org/GoodBoyDigital/pixi.js)
|
||||
=============
|
||||
|
||||

|
||||
|
|
|
@ -304,15 +304,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;
|
||||
}
|
||||
|
@ -327,11 +326,8 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'worldVisible', {
|
|||
* @type Graphics
|
||||
*/
|
||||
Object.defineProperty(PIXI.DisplayObject.prototype, 'mask', {
|
||||
|
||||
get: function() {
|
||||
|
||||
return this._mask;
|
||||
|
||||
},
|
||||
set: function(value) {
|
||||
|
||||
|
@ -369,8 +365,6 @@ Object.defineProperty(PIXI.DisplayObject.prototype, 'filters', {
|
|||
|
||||
// TODO change this as it is legacy
|
||||
this._filterBlock = {target:this, filterPasses:passes};
|
||||
|
||||
|
||||
}
|
||||
|
||||
this._filters = value;
|
||||
|
@ -469,4 +463,4 @@ PIXI.DisplayObject.prototype._renderCanvas = function(renderSession)
|
|||
|
||||
PIXI.EmptyRectangle = new PIXI.Rectangle(0,0,0,0);
|
||||
|
||||
PIXI.visibleCount = 0;
|
||||
PIXI.visibleCount = 0;
|
||||
|
|
|
@ -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)
|
||||
*
|
||||
|
@ -88,7 +79,6 @@ PIXI.Sprite = function(texture)
|
|||
|
||||
if(texture.baseTexture.hasLoaded)
|
||||
{
|
||||
this.updateFrame = true;
|
||||
this.onTextureUpdate();
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue