diff --git a/Gruntfile.js b/Gruntfile.js index 073ec34..aa18450 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -43,6 +43,7 @@ '<%= dirs.src %>/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/Gruntfile.js b/Gruntfile.js index 073ec34..aa18450 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -43,6 +43,7 @@ '<%= dirs.src %>/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index a9f3ad0..fc89d8e 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-28 + * Compiled: 2013-12-29 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1445,7 +1445,7 @@ child._renderCanvas(renderSession); } - if(this.mask) + if(this._mask) { renderSession.maskManager.popMask(renderSession.context); } @@ -1692,38 +1692,44 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession) { + // if the sprite is not visible or the alpha is 0 then no need to render this element if(this.visible === false || this.alpha === 0)return; + // do a quick check to see if this element has a mask or a filter. if(this._mask || this._filters) { + var spriteBatch = renderSession.spriteBatch; + if(this._mask) { - renderSession.spriteBatch.stop(); + spriteBatch.stop(); renderSession.maskManager.pushMask(this.mask, renderSession.projection); - renderSession.spriteBatch.start(); + spriteBatch.start(); } if(this._filters) { - renderSession.spriteBatch.flush(); + spriteBatch.flush(); renderSession.filterManager.pushFilter(this._filterBlock); } - renderSession.spriteBatch.render(this); + // add this sprite to the batch + spriteBatch.render(this); - // simple render children! + // now loop through the children and make sure they get rendered for(var i=0,j=this.children.length; i/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index a9f3ad0..fc89d8e 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-28 + * Compiled: 2013-12-29 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1445,7 +1445,7 @@ child._renderCanvas(renderSession); } - if(this.mask) + if(this._mask) { renderSession.maskManager.popMask(renderSession.context); } @@ -1692,38 +1692,44 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession) { + // if the sprite is not visible or the alpha is 0 then no need to render this element if(this.visible === false || this.alpha === 0)return; + // do a quick check to see if this element has a mask or a filter. if(this._mask || this._filters) { + var spriteBatch = renderSession.spriteBatch; + if(this._mask) { - renderSession.spriteBatch.stop(); + spriteBatch.stop(); renderSession.maskManager.pushMask(this.mask, renderSession.projection); - renderSession.spriteBatch.start(); + spriteBatch.start(); } if(this._filters) { - renderSession.spriteBatch.flush(); + spriteBatch.flush(); renderSession.filterManager.pushFilter(this._filterBlock); } - renderSession.spriteBatch.render(this); + // add this sprite to the batch + spriteBatch.render(this); - // simple render children! + // now loop through the children and make sure they get rendered for(var i=0,j=this.children.length; i/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index a9f3ad0..fc89d8e 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-28 + * Compiled: 2013-12-29 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1445,7 +1445,7 @@ child._renderCanvas(renderSession); } - if(this.mask) + if(this._mask) { renderSession.maskManager.popMask(renderSession.context); } @@ -1692,38 +1692,44 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession) { + // if the sprite is not visible or the alpha is 0 then no need to render this element if(this.visible === false || this.alpha === 0)return; + // do a quick check to see if this element has a mask or a filter. if(this._mask || this._filters) { + var spriteBatch = renderSession.spriteBatch; + if(this._mask) { - renderSession.spriteBatch.stop(); + spriteBatch.stop(); renderSession.maskManager.pushMask(this.mask, renderSession.projection); - renderSession.spriteBatch.start(); + spriteBatch.start(); } if(this._filters) { - renderSession.spriteBatch.flush(); + spriteBatch.flush(); renderSession.filterManager.pushFilter(this._filterBlock); } - renderSession.spriteBatch.render(this); + // add this sprite to the batch + spriteBatch.render(this); - // simple render children! + // now loop through the children and make sure they get rendered for(var i=0,j=this.children.length; i/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index a9f3ad0..fc89d8e 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-28 + * Compiled: 2013-12-29 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1445,7 +1445,7 @@ child._renderCanvas(renderSession); } - if(this.mask) + if(this._mask) { renderSession.maskManager.popMask(renderSession.context); } @@ -1692,38 +1692,44 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession) { + // if the sprite is not visible or the alpha is 0 then no need to render this element if(this.visible === false || this.alpha === 0)return; + // do a quick check to see if this element has a mask or a filter. if(this._mask || this._filters) { + var spriteBatch = renderSession.spriteBatch; + if(this._mask) { - renderSession.spriteBatch.stop(); + spriteBatch.stop(); renderSession.maskManager.pushMask(this.mask, renderSession.projection); - renderSession.spriteBatch.start(); + spriteBatch.start(); } if(this._filters) { - renderSession.spriteBatch.flush(); + spriteBatch.flush(); renderSession.filterManager.pushFilter(this._filterBlock); } - renderSession.spriteBatch.render(this); + // add this sprite to the batch + spriteBatch.render(this); - // simple render children! + // now loop through the children and make sure they get rendered for(var i=0,j=this.children.length; i/renderers/webgl/WebGLRenderGroup.js', '<%= dirs.src %>/renderers/webgl/utils/WebGLFilterManager.js', '<%= dirs.src %>/renderers/canvas/utils/CanvasMaskManager.js', + '<%= dirs.src %>/renderers/canvas/utils/CanvasTinter.js', '<%= dirs.src %>/renderers/canvas/CanvasRenderer.js', '<%= dirs.src %>/renderers/canvas/CanvasGraphics.js', '<%= dirs.src %>/primitives/Graphics.js', diff --git a/bin/pixi.dev.js b/bin/pixi.dev.js index a9f3ad0..fc89d8e 100644 --- a/bin/pixi.dev.js +++ b/bin/pixi.dev.js @@ -4,7 +4,7 @@ * Copyright (c) 2012, Mat Groves * http://goodboydigital.com/ * - * Compiled: 2013-12-28 + * Compiled: 2013-12-29 * * Pixi.JS is licensed under the MIT License. * http://www.opensource.org/licenses/mit-license.php @@ -1445,7 +1445,7 @@ child._renderCanvas(renderSession); } - if(this.mask) + if(this._mask) { renderSession.maskManager.popMask(renderSession.context); } @@ -1692,38 +1692,44 @@ PIXI.Sprite.prototype._renderWebGL = function(renderSession) { + // if the sprite is not visible or the alpha is 0 then no need to render this element if(this.visible === false || this.alpha === 0)return; + // do a quick check to see if this element has a mask or a filter. if(this._mask || this._filters) { + var spriteBatch = renderSession.spriteBatch; + if(this._mask) { - renderSession.spriteBatch.stop(); + spriteBatch.stop(); renderSession.maskManager.pushMask(this.mask, renderSession.projection); - renderSession.spriteBatch.start(); + spriteBatch.start(); } if(this._filters) { - renderSession.spriteBatch.flush(); + spriteBatch.flush(); renderSession.filterManager.pushFilter(this._filterBlock); } - renderSession.spriteBatch.render(this); + // add this sprite to the batch + spriteBatch.render(this); - // simple render children! + // now loop through the children and make sure they get rendered for(var i=0,j=this.children.length; i