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

Republished Bin Files

Browse source
This commit is contained in:
Mat Groves 2014-01-16 16:11:54 +00:00
parent 237b5f3851
commit 480bf36ddf
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

19
bin/pixi.dev.js
View file

@ -1,10 +1,10 @@
/** /**
* @license * @license
* pixi.js - v1.4.2 * pixi.js - v1.4.3
* Copyright (c) 2012, Mat Groves * Copyright (c) 2012, Mat Groves
* http://goodboydigital.com/ * http://goodboydigital.com/
* *
* Compiled: 2014-01-15 * Compiled: 2014-01-16
* *
* 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
@ -72,6 +72,12 @@ PIXI.Point.prototype.clone = function()
// constructor // constructor
PIXI.Point.prototype.constructor = PIXI.Point; PIXI.Point.prototype.constructor = PIXI.Point;
PIXI.Point.prototype.set = function(x, y)
{
this.x = x || 0;
this.y = y || (y !== 0) ? x : 0 ;
};
/** /**
* @author Mat Groves http://matgroves.com/ * @author Mat Groves http://matgroves.com/
@ -1250,11 +1256,10 @@ PIXI.DisplayObjectContainer.prototype.addChild = function(child)
// return; // return;
} }
// console.log("ADDING")
child.parent = this; child.parent = this;
this.children.push(child); this.children.push(child);
// console.log( this.children.length);
// update the stage refference.. // update the stage refference..
if(this.stage)child.setStageReference(this.stage); if(this.stage)child.setStageReference(this.stage);
@ -1530,7 +1535,7 @@ PIXI.blendModes.SCREEN = 3;
/** /**
* The SPrite object is the base for all textured objects that are rendered to the screen * The SPrite object is the base for all textured objects that are rendered to the screen
* *
* @class Sprite™ * @class Sprite
* @extends DisplayObjectContainer * @extends DisplayObjectContainer
* @constructor * @constructor
* @param texture {Texture} The texture for this sprite * @param texture {Texture} The texture for this sprite
@ -7999,7 +8004,7 @@ PIXI.TilingSprite.prototype._renderWebGL = function(renderSession)
if(this.mask) if(this.mask)
{ {
renderSession.spriteBatch.stop(); renderSession.spriteBatch.stop();
renderSession.maskManager.pushMask(this.mask, renderSession.projection); renderSession.maskManager.pushMask(this.mask, renderSession);
renderSession.spriteBatch.start(); renderSession.spriteBatch.start();
} }
@ -8021,7 +8026,7 @@ PIXI.TilingSprite.prototype._renderWebGL = function(renderSession)
renderSession.spriteBatch.stop(); renderSession.spriteBatch.stop();
if(this.filters)renderSession.filterManager.popFilter(); if(this.filters)renderSession.filterManager.popFilter();
if(this.mask)renderSession.maskManager.popMask(renderSession.projection); if(this.mask)renderSession.maskManager.popMask(renderSession);
renderSession.spriteBatch.start(); renderSession.spriteBatch.start();
} }

10
bin/pixi.js
View file

File diff suppressed because one or more lines are too long