diff --git a/src/pixi/extras/TilingSprite.js b/src/pixi/extras/TilingSprite.js index 41e88a6..4bdc23e 100644 --- a/src/pixi/extras/TilingSprite.js +++ b/src/pixi/extras/TilingSprite.js @@ -186,7 +186,7 @@ renderSession.spriteBatch.stop(); if (this._filters) renderSession.filterManager.popFilter(); - if (this._mask) renderSession.maskManager.popMask(renderSession); + if (this._mask) renderSession.maskManager.popMask(this._mask, renderSession); renderSession.spriteBatch.start(); }; @@ -452,4 +452,4 @@ this.refreshTexture = false; this.tilingTexture.baseTexture._powerOf2 = true; -}; \ No newline at end of file +}; diff --git a/src/pixi/extras/TilingSprite.js b/src/pixi/extras/TilingSprite.js index 41e88a6..4bdc23e 100644 --- a/src/pixi/extras/TilingSprite.js +++ b/src/pixi/extras/TilingSprite.js @@ -186,7 +186,7 @@ renderSession.spriteBatch.stop(); if (this._filters) renderSession.filterManager.popFilter(); - if (this._mask) renderSession.maskManager.popMask(renderSession); + if (this._mask) renderSession.maskManager.popMask(this._mask, renderSession); renderSession.spriteBatch.start(); }; @@ -452,4 +452,4 @@ this.refreshTexture = false; this.tilingTexture.baseTexture._powerOf2 = true; -}; \ No newline at end of file +}; diff --git a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js index dee407e..b40efaf 100644 --- a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js @@ -10,13 +10,7 @@ */ PIXI.WebGLMaskManager = function(gl) { - this.maskStack = []; - this.maskPosition = 0; - this.setContext(gl); - - this.reverse = false; - this.count = 0; }; /** @@ -68,6 +62,5 @@ */ PIXI.WebGLMaskManager.prototype.destroy = function() { - this.maskStack = null; this.gl = null; -}; \ No newline at end of file +}; diff --git a/src/pixi/extras/TilingSprite.js b/src/pixi/extras/TilingSprite.js index 41e88a6..4bdc23e 100644 --- a/src/pixi/extras/TilingSprite.js +++ b/src/pixi/extras/TilingSprite.js @@ -186,7 +186,7 @@ renderSession.spriteBatch.stop(); if (this._filters) renderSession.filterManager.popFilter(); - if (this._mask) renderSession.maskManager.popMask(renderSession); + if (this._mask) renderSession.maskManager.popMask(this._mask, renderSession); renderSession.spriteBatch.start(); }; @@ -452,4 +452,4 @@ this.refreshTexture = false; this.tilingTexture.baseTexture._powerOf2 = true; -}; \ No newline at end of file +}; diff --git a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js index dee407e..b40efaf 100644 --- a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js @@ -10,13 +10,7 @@ */ PIXI.WebGLMaskManager = function(gl) { - this.maskStack = []; - this.maskPosition = 0; - this.setContext(gl); - - this.reverse = false; - this.count = 0; }; /** @@ -68,6 +62,5 @@ */ PIXI.WebGLMaskManager.prototype.destroy = function() { - this.maskStack = null; this.gl = null; -}; \ No newline at end of file +}; diff --git a/src/pixi/renderers/webgl/utils/WebGLShaderManager.js b/src/pixi/renderers/webgl/utils/WebGLShaderManager.js index 3d7aa35..626ac21 100644 --- a/src/pixi/renderers/webgl/utils/WebGLShaderManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLShaderManager.js @@ -14,7 +14,6 @@ this.maxAttibs = 10; this.attribState = []; this.tempAttribState = []; - this.shaderMap = []; for (var i = 0; i < this.maxAttibs; i++) { this.attribState[i] = false; @@ -39,7 +38,7 @@ this.primitiveShader = new PIXI.PrimitiveShader(gl); // the next one is used for rendering triangle strips - this.complexPrimativeShader = new PIXI.ComplexPrimitiveShader(gl); + this.complexPrimitiveShader = new PIXI.ComplexPrimitiveShader(gl); // this shader is used for the default sprite rendering this.defaultShader = new PIXI.PixiShader(gl); @@ -122,6 +121,8 @@ this.primitiveShader.destroy(); + this.complexPrimitiveShader.destroy(); + this.defaultShader.destroy(); this.fastShader.destroy(); diff --git a/src/pixi/extras/TilingSprite.js b/src/pixi/extras/TilingSprite.js index 41e88a6..4bdc23e 100644 --- a/src/pixi/extras/TilingSprite.js +++ b/src/pixi/extras/TilingSprite.js @@ -186,7 +186,7 @@ renderSession.spriteBatch.stop(); if (this._filters) renderSession.filterManager.popFilter(); - if (this._mask) renderSession.maskManager.popMask(renderSession); + if (this._mask) renderSession.maskManager.popMask(this._mask, renderSession); renderSession.spriteBatch.start(); }; @@ -452,4 +452,4 @@ this.refreshTexture = false; this.tilingTexture.baseTexture._powerOf2 = true; -}; \ No newline at end of file +}; diff --git a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js index dee407e..b40efaf 100644 --- a/src/pixi/renderers/webgl/utils/WebGLMaskManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLMaskManager.js @@ -10,13 +10,7 @@ */ PIXI.WebGLMaskManager = function(gl) { - this.maskStack = []; - this.maskPosition = 0; - this.setContext(gl); - - this.reverse = false; - this.count = 0; }; /** @@ -68,6 +62,5 @@ */ PIXI.WebGLMaskManager.prototype.destroy = function() { - this.maskStack = null; this.gl = null; -}; \ No newline at end of file +}; diff --git a/src/pixi/renderers/webgl/utils/WebGLShaderManager.js b/src/pixi/renderers/webgl/utils/WebGLShaderManager.js index 3d7aa35..626ac21 100644 --- a/src/pixi/renderers/webgl/utils/WebGLShaderManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLShaderManager.js @@ -14,7 +14,6 @@ this.maxAttibs = 10; this.attribState = []; this.tempAttribState = []; - this.shaderMap = []; for (var i = 0; i < this.maxAttibs; i++) { this.attribState[i] = false; @@ -39,7 +38,7 @@ this.primitiveShader = new PIXI.PrimitiveShader(gl); // the next one is used for rendering triangle strips - this.complexPrimativeShader = new PIXI.ComplexPrimitiveShader(gl); + this.complexPrimitiveShader = new PIXI.ComplexPrimitiveShader(gl); // this shader is used for the default sprite rendering this.defaultShader = new PIXI.PixiShader(gl); @@ -122,6 +121,8 @@ this.primitiveShader.destroy(); + this.complexPrimitiveShader.destroy(); + this.defaultShader.destroy(); this.fastShader.destroy(); diff --git a/src/pixi/renderers/webgl/utils/WebGLStencilManager.js b/src/pixi/renderers/webgl/utils/WebGLStencilManager.js index 5101403..411096a 100644 --- a/src/pixi/renderers/webgl/utils/WebGLStencilManager.js +++ b/src/pixi/renderers/webgl/utils/WebGLStencilManager.js @@ -138,7 +138,7 @@ if(webGLData.mode === 1) { - shader = renderSession.shaderManager.complexPrimativeShader; + shader = renderSession.shaderManager.complexPrimitiveShader; renderSession.shaderManager.setShader( shader ); @@ -285,4 +285,4 @@ { this.maskStack = null; this.gl = null; -}; \ No newline at end of file +};