diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index ca6799b..4dcd393 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -50,7 +50,7 @@ */ WebGLFilterManager.prototype.begin = function (buffer) { - this.defaultShader = this.renderer.shaderManager.defaultShader; + this.defaultShader = this.renderer.shaderManager.plugins.defaultShader; this.width = this.renderer.projection.x * 2; this.height = -this.renderer.projection.y * 2; diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index ca6799b..4dcd393 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -50,7 +50,7 @@ */ WebGLFilterManager.prototype.begin = function (buffer) { - this.defaultShader = this.renderer.shaderManager.defaultShader; + this.defaultShader = this.renderer.shaderManager.plugins.defaultShader; this.width = this.renderer.projection.x * 2; this.height = -this.renderer.projection.y * 2; diff --git a/src/core/renderers/webgl/managers/WebGLMaskManager.js b/src/core/renderers/webgl/managers/WebGLMaskManager.js index 3127f46..d6a11c1 100644 --- a/src/core/renderers/webgl/managers/WebGLMaskManager.js +++ b/src/core/renderers/webgl/managers/WebGLMaskManager.js @@ -126,11 +126,11 @@ // bind the graphics object.. var projection = this.renderer.projection, offset = this.renderer.offset, - shader;// = this.renderer.shaderManager.primitiveShader; + shader;// = this.renderer.shaderManager.plugins.primitiveShader; if (webGLData.mode === 1) { - shader = this.renderer.shaderManager.complexPrimitiveShader; + shader = this.renderer.shaderManager.plugins.complexPrimitiveShader; this.renderer.shaderManager.setShader(shader); @@ -156,7 +156,7 @@ else { //this.renderer.shaderManager.activatePrimitiveShader(); - shader = this.renderer.shaderManager.primitiveShader; + shader = this.renderer.shaderManager.plugins.primitiveShader; this.renderer.shaderManager.setShader( shader ); gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index ca6799b..4dcd393 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -50,7 +50,7 @@ */ WebGLFilterManager.prototype.begin = function (buffer) { - this.defaultShader = this.renderer.shaderManager.defaultShader; + this.defaultShader = this.renderer.shaderManager.plugins.defaultShader; this.width = this.renderer.projection.x * 2; this.height = -this.renderer.projection.y * 2; diff --git a/src/core/renderers/webgl/managers/WebGLMaskManager.js b/src/core/renderers/webgl/managers/WebGLMaskManager.js index 3127f46..d6a11c1 100644 --- a/src/core/renderers/webgl/managers/WebGLMaskManager.js +++ b/src/core/renderers/webgl/managers/WebGLMaskManager.js @@ -126,11 +126,11 @@ // bind the graphics object.. var projection = this.renderer.projection, offset = this.renderer.offset, - shader;// = this.renderer.shaderManager.primitiveShader; + shader;// = this.renderer.shaderManager.plugins.primitiveShader; if (webGLData.mode === 1) { - shader = this.renderer.shaderManager.complexPrimitiveShader; + shader = this.renderer.shaderManager.plugins.complexPrimitiveShader; this.renderer.shaderManager.setShader(shader); @@ -156,7 +156,7 @@ else { //this.renderer.shaderManager.activatePrimitiveShader(); - shader = this.renderer.shaderManager.primitiveShader; + shader = this.renderer.shaderManager.plugins.primitiveShader; this.renderer.shaderManager.setShader( shader ); gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js index a63f4d7..3f37b7d 100644 --- a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -183,7 +183,7 @@ */ WebGLFastSpriteBatch.prototype.begin = function (spriteBatch) { - this.shader = this.renderer.shaderManager.fastShader; + this.shader = this.renderer.shaderManager.plugins.fastShader; this.matrix = spriteBatch.worldTransform.toArray(true); diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index ca6799b..4dcd393 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -50,7 +50,7 @@ */ WebGLFilterManager.prototype.begin = function (buffer) { - this.defaultShader = this.renderer.shaderManager.defaultShader; + this.defaultShader = this.renderer.shaderManager.plugins.defaultShader; this.width = this.renderer.projection.x * 2; this.height = -this.renderer.projection.y * 2; diff --git a/src/core/renderers/webgl/managers/WebGLMaskManager.js b/src/core/renderers/webgl/managers/WebGLMaskManager.js index 3127f46..d6a11c1 100644 --- a/src/core/renderers/webgl/managers/WebGLMaskManager.js +++ b/src/core/renderers/webgl/managers/WebGLMaskManager.js @@ -126,11 +126,11 @@ // bind the graphics object.. var projection = this.renderer.projection, offset = this.renderer.offset, - shader;// = this.renderer.shaderManager.primitiveShader; + shader;// = this.renderer.shaderManager.plugins.primitiveShader; if (webGLData.mode === 1) { - shader = this.renderer.shaderManager.complexPrimitiveShader; + shader = this.renderer.shaderManager.plugins.complexPrimitiveShader; this.renderer.shaderManager.setShader(shader); @@ -156,7 +156,7 @@ else { //this.renderer.shaderManager.activatePrimitiveShader(); - shader = this.renderer.shaderManager.primitiveShader; + shader = this.renderer.shaderManager.plugins.primitiveShader; this.renderer.shaderManager.setShader( shader ); gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js index a63f4d7..3f37b7d 100644 --- a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -183,7 +183,7 @@ */ WebGLFastSpriteBatch.prototype.begin = function (spriteBatch) { - this.shader = this.renderer.shaderManager.fastShader; + this.shader = this.renderer.shaderManager.plugins.fastShader; this.matrix = spriteBatch.worldTransform.toArray(true); diff --git a/src/core/sprites/SpriteBatch.js b/src/core/sprites/SpriteBatch.js index 63cebc0..4fe33e4 100644 --- a/src/core/sprites/SpriteBatch.js +++ b/src/core/sprites/SpriteBatch.js @@ -61,7 +61,7 @@ renderer.spriteBatch.stop(); - renderer.shaderManager.setShader(renderer.shaderManager.fastShader); + renderer.shaderManager.setShader(renderer.shaderManager.plugins.fastShader); renderer.fastSpriteBatch.begin(this); renderer.fastSpriteBatch.render(this); diff --git a/src/core/graphics/webgl/GraphicsRenderer.js b/src/core/graphics/webgl/GraphicsRenderer.js index d812d8e..c81350b 100644 --- a/src/core/graphics/webgl/GraphicsRenderer.js +++ b/src/core/graphics/webgl/GraphicsRenderer.js @@ -46,7 +46,7 @@ var renderer = this.renderer; var gl = renderer.gl; - var shader = renderer.shaderManager.primitiveShader, + var shader = renderer.shaderManager.plugins.primitiveShader, webGLData; if (graphics.dirty) @@ -83,7 +83,7 @@ renderer.shaderManager.setShader( shader );//activatePrimitiveShader(); - shader = renderer.shaderManager.primitiveShader; + shader = renderer.shaderManager.plugins.primitiveShader; gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index ca6799b..4dcd393 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -50,7 +50,7 @@ */ WebGLFilterManager.prototype.begin = function (buffer) { - this.defaultShader = this.renderer.shaderManager.defaultShader; + this.defaultShader = this.renderer.shaderManager.plugins.defaultShader; this.width = this.renderer.projection.x * 2; this.height = -this.renderer.projection.y * 2; diff --git a/src/core/renderers/webgl/managers/WebGLMaskManager.js b/src/core/renderers/webgl/managers/WebGLMaskManager.js index 3127f46..d6a11c1 100644 --- a/src/core/renderers/webgl/managers/WebGLMaskManager.js +++ b/src/core/renderers/webgl/managers/WebGLMaskManager.js @@ -126,11 +126,11 @@ // bind the graphics object.. var projection = this.renderer.projection, offset = this.renderer.offset, - shader;// = this.renderer.shaderManager.primitiveShader; + shader;// = this.renderer.shaderManager.plugins.primitiveShader; if (webGLData.mode === 1) { - shader = this.renderer.shaderManager.complexPrimitiveShader; + shader = this.renderer.shaderManager.plugins.complexPrimitiveShader; this.renderer.shaderManager.setShader(shader); @@ -156,7 +156,7 @@ else { //this.renderer.shaderManager.activatePrimitiveShader(); - shader = this.renderer.shaderManager.primitiveShader; + shader = this.renderer.shaderManager.plugins.primitiveShader; this.renderer.shaderManager.setShader( shader ); gl.uniformMatrix3fv(shader.uniforms.translationMatrix._location, false, graphics.worldTransform.toArray(true)); diff --git a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js index a63f4d7..3f37b7d 100644 --- a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -183,7 +183,7 @@ */ WebGLFastSpriteBatch.prototype.begin = function (spriteBatch) { - this.shader = this.renderer.shaderManager.fastShader; + this.shader = this.renderer.shaderManager.plugins.fastShader; this.matrix = spriteBatch.worldTransform.toArray(true); diff --git a/src/core/sprites/SpriteBatch.js b/src/core/sprites/SpriteBatch.js index 63cebc0..4fe33e4 100644 --- a/src/core/sprites/SpriteBatch.js +++ b/src/core/sprites/SpriteBatch.js @@ -61,7 +61,7 @@ renderer.spriteBatch.stop(); - renderer.shaderManager.setShader(renderer.shaderManager.fastShader); + renderer.shaderManager.setShader(renderer.shaderManager.plugins.fastShader); renderer.fastSpriteBatch.begin(this); renderer.fastSpriteBatch.render(this); diff --git a/src/extras/Strip.js b/src/extras/Strip.js index 57691b5..6bf78cb 100644 --- a/src/extras/Strip.js +++ b/src/extras/Strip.js @@ -89,7 +89,7 @@ this._initWebGL(renderer); } - renderer.shaderManager.setShader(renderer.shaderManager.stripShader); + renderer.shaderManager.setShader(renderer.shaderManager.plugins.stripShader); this._renderStrip(renderer); @@ -128,7 +128,7 @@ var gl = renderer.gl; var projection = renderer.projection, offset = renderer.offset, - shader = renderer.shaderManager.stripShader; + shader = renderer.shaderManager.plugins.stripShader; var drawMode = this.drawMode === Strip.DrawModes.TRIANGLE_STRIP ? gl.TRIANGLE_STRIP : gl.TRIANGLES;