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

Fixes #503 PIXI.Graphics now renders its Children

Browse source
This commit is contained in:
Mat Groves 2014-01-15 11:07:20 +00:00
parent d262a2c46e
commit aeac4a5f4e
3 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
bin/pixi.dev.js
View file

@ -1,6 +1,6 @@
/** /**
* @license * @license
* pixi.js - v1.4.0 * pixi.js - v1.4.2
* Copyright (c) 2012, Mat Groves * Copyright (c) 2012, Mat Groves
* http://goodboydigital.com/ * http://goodboydigital.com/
* *
@ -6525,9 +6525,9 @@ PIXI.CanvasTinter.roundColor = function(color)
var rgbValues = PIXI.hex2rgb(color); var rgbValues = PIXI.hex2rgb(color);
rgbValues[0] = Math.round(rgbValues[0] * step) / step; rgbValues[0] = Math.min(255, Math.round(rgbValues[0] / step) * step);
rgbValues[1] = Math.round(rgbValues[1] * step) / step; rgbValues[1] = Math.min(255, Math.round(rgbValues[1] / step) * step);
rgbValues[2] = Math.round(rgbValues[2] * step) / step; rgbValues[2] = Math.min(255, Math.round(rgbValues[2] / step) * step);
return PIXI.rgb2hex(rgbValues); return PIXI.rgb2hex(rgbValues);
}; };
@ -7414,6 +7414,16 @@ PIXI.Graphics.prototype._renderWebGL = function(renderSession)
PIXI.WebGLGraphics.renderGraphics(this, renderSession); PIXI.WebGLGraphics.renderGraphics(this, renderSession);
renderSession.spriteBatch.start();
// simple render children!
for(var i=0, j=this.children.length; i<j; i++)
{
this.children[i]._renderWebGL(renderSession);
}
renderSession.spriteBatch.stop();
if(this._filters)renderSession.filterManager.popFilter(); if(this._filters)renderSession.filterManager.popFilter();
if(this._mask)renderSession.maskManager.popMask(renderSession); if(this._mask)renderSession.maskManager.popMask(renderSession);
@ -7439,6 +7449,12 @@ PIXI.Graphics.prototype._renderCanvas = function(renderSession)
context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]); context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
PIXI.CanvasGraphics.renderGraphics(this, context); PIXI.CanvasGraphics.renderGraphics(this, context);
// simple render children!
for(var i=0, j=this.children.length; i<j; i++)
{
this.children[i]._renderCanvas(renderSession);
}
}; };
PIXI.Graphics.prototype.getBounds = function() PIXI.Graphics.prototype.getBounds = function()

6
bin/pixi.js
View file

File diff suppressed because one or more lines are too long

16
src/pixi/primitives/Graphics.js
View file

@ -331,6 +331,16 @@ PIXI.Graphics.prototype._renderWebGL = function(renderSession)
PIXI.WebGLGraphics.renderGraphics(this, renderSession); PIXI.WebGLGraphics.renderGraphics(this, renderSession);
renderSession.spriteBatch.start();
// simple render children!
for(var i=0, j=this.children.length; i<j; i++)
{
this.children[i]._renderWebGL(renderSession);
}
renderSession.spriteBatch.stop();
if(this._filters)renderSession.filterManager.popFilter(); if(this._filters)renderSession.filterManager.popFilter();
if(this._mask)renderSession.maskManager.popMask(renderSession); if(this._mask)renderSession.maskManager.popMask(renderSession);
@ -356,6 +366,12 @@ PIXI.Graphics.prototype._renderCanvas = function(renderSession)
context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]); context.setTransform(transform[0], transform[3], transform[1], transform[4], transform[2], transform[5]);
PIXI.CanvasGraphics.renderGraphics(this, context); PIXI.CanvasGraphics.renderGraphics(this, context);
// simple render children!
for(var i=0, j=this.children.length; i<j; i++)
{
this.children[i]._renderCanvas(renderSession);
}
}; };
PIXI.Graphics.prototype.getBounds = function() PIXI.Graphics.prototype.getBounds = function()