diff --git a/src/core/display/SpriteBatch.js b/src/core/display/SpriteBatch.js index 959af0e..299c981 100644 --- a/src/core/display/SpriteBatch.js +++ b/src/core/display/SpriteBatch.js @@ -75,7 +75,7 @@ renderer.shaderManager.setShader(renderer.shaderManager.fastShader); - this.fastSpriteBatch.begin(this, renderer); + this.fastSpriteBatch.begin(this); this.fastSpriteBatch.render(this); renderer.spriteBatch.start(); diff --git a/src/core/display/SpriteBatch.js b/src/core/display/SpriteBatch.js index 959af0e..299c981 100644 --- a/src/core/display/SpriteBatch.js +++ b/src/core/display/SpriteBatch.js @@ -75,7 +75,7 @@ renderer.shaderManager.setShader(renderer.shaderManager.fastShader); - this.fastSpriteBatch.begin(this, renderer); + this.fastSpriteBatch.begin(this); this.fastSpriteBatch.render(this); renderer.spriteBatch.start(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index fb7095a..a8b7c7f 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -329,10 +329,10 @@ this.offset = this.offset; // start the sprite batch - this.spriteBatch.begin(this); + this.spriteBatch.begin(); // start the filter manager - this.filterManager.begin(this, buffer); + this.filterManager.begin(buffer); // render the scene! displayObject.renderWebGL(this); diff --git a/src/core/display/SpriteBatch.js b/src/core/display/SpriteBatch.js index 959af0e..299c981 100644 --- a/src/core/display/SpriteBatch.js +++ b/src/core/display/SpriteBatch.js @@ -75,7 +75,7 @@ renderer.shaderManager.setShader(renderer.shaderManager.fastShader); - this.fastSpriteBatch.begin(this, renderer); + this.fastSpriteBatch.begin(this); this.fastSpriteBatch.render(this); renderer.spriteBatch.start(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index fb7095a..a8b7c7f 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -329,10 +329,10 @@ this.offset = this.offset; // start the sprite batch - this.spriteBatch.begin(this); + this.spriteBatch.begin(); // start the filter manager - this.filterManager.begin(this, buffer); + this.filterManager.begin(buffer); // render the scene! displayObject.renderWebGL(this); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index 81abeb1..1179258 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -46,12 +46,11 @@ * @param renderer {WebGLRenderer} * @param buffer {ArrayBuffer} */ -WebGLFilterManager.prototype.begin = function (renderer, buffer) { - this.renderer = renderer; - this.defaultShader = renderer.shaderManager.defaultShader; +WebGLFilterManager.prototype.begin = function (buffer) { + this.defaultShader = this.renderer.shaderManager.defaultShader; - this.width = renderer.projection.x * 2; - this.height = -renderer.projection.y * 2; + this.width = this.renderer.projection.x * 2; + this.height = -this.renderer.projection.y * 2; this.buffer = buffer; }; diff --git a/src/core/display/SpriteBatch.js b/src/core/display/SpriteBatch.js index 959af0e..299c981 100644 --- a/src/core/display/SpriteBatch.js +++ b/src/core/display/SpriteBatch.js @@ -75,7 +75,7 @@ renderer.shaderManager.setShader(renderer.shaderManager.fastShader); - this.fastSpriteBatch.begin(this, renderer); + this.fastSpriteBatch.begin(this); this.fastSpriteBatch.render(this); renderer.spriteBatch.start(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index fb7095a..a8b7c7f 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -329,10 +329,10 @@ this.offset = this.offset; // start the sprite batch - this.spriteBatch.begin(this); + this.spriteBatch.begin(); // start the filter manager - this.filterManager.begin(this, buffer); + this.filterManager.begin(buffer); // render the scene! displayObject.renderWebGL(this); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index 81abeb1..1179258 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -46,12 +46,11 @@ * @param renderer {WebGLRenderer} * @param buffer {ArrayBuffer} */ -WebGLFilterManager.prototype.begin = function (renderer, buffer) { - this.renderer = renderer; - this.defaultShader = renderer.shaderManager.defaultShader; +WebGLFilterManager.prototype.begin = function (buffer) { + this.defaultShader = this.renderer.shaderManager.defaultShader; - this.width = renderer.projection.x * 2; - this.height = -renderer.projection.y * 2; + this.width = this.renderer.projection.x * 2; + this.height = -this.renderer.projection.y * 2; this.buffer = buffer; }; diff --git a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js index 59c3846..01aa070 100644 --- a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -10,10 +10,17 @@ /** * @class + * @private * @namespace PIXI + * @param renderer {WebGLRenderer} The renderer this sprite batch works for. */ function WebGLFastSpriteBatch(renderer) { /** + * @member {WebGLRenderer} + */ + this.renderer = renderer; + + /** * @member {number} */ this.vertSize = 10; @@ -100,8 +107,6 @@ */ this.matrix = null; - this.renderer = renderer; - this.setupContext(); } @@ -134,9 +139,8 @@ * @param spriteBatch {WebGLSpriteBatch} * @param renderer {WebGLRenderer|CanvasRenderer} The renderer */ -WebGLFastSpriteBatch.prototype.begin = function (spriteBatch, renderer) { - this.renderer = renderer; - this.shader = renderer.shaderManager.fastShader; +WebGLFastSpriteBatch.prototype.begin = function (spriteBatch) { + this.shader = this.renderer.shaderManager.fastShader; this.matrix = spriteBatch.worldTransform.toArray(true); diff --git a/src/core/display/SpriteBatch.js b/src/core/display/SpriteBatch.js index 959af0e..299c981 100644 --- a/src/core/display/SpriteBatch.js +++ b/src/core/display/SpriteBatch.js @@ -75,7 +75,7 @@ renderer.shaderManager.setShader(renderer.shaderManager.fastShader); - this.fastSpriteBatch.begin(this, renderer); + this.fastSpriteBatch.begin(this); this.fastSpriteBatch.render(this); renderer.spriteBatch.start(); diff --git a/src/core/renderers/webgl/WebGLRenderer.js b/src/core/renderers/webgl/WebGLRenderer.js index fb7095a..a8b7c7f 100644 --- a/src/core/renderers/webgl/WebGLRenderer.js +++ b/src/core/renderers/webgl/WebGLRenderer.js @@ -329,10 +329,10 @@ this.offset = this.offset; // start the sprite batch - this.spriteBatch.begin(this); + this.spriteBatch.begin(); // start the filter manager - this.filterManager.begin(this, buffer); + this.filterManager.begin(buffer); // render the scene! displayObject.renderWebGL(this); diff --git a/src/core/renderers/webgl/managers/WebGLFilterManager.js b/src/core/renderers/webgl/managers/WebGLFilterManager.js index 81abeb1..1179258 100644 --- a/src/core/renderers/webgl/managers/WebGLFilterManager.js +++ b/src/core/renderers/webgl/managers/WebGLFilterManager.js @@ -46,12 +46,11 @@ * @param renderer {WebGLRenderer} * @param buffer {ArrayBuffer} */ -WebGLFilterManager.prototype.begin = function (renderer, buffer) { - this.renderer = renderer; - this.defaultShader = renderer.shaderManager.defaultShader; +WebGLFilterManager.prototype.begin = function (buffer) { + this.defaultShader = this.renderer.shaderManager.defaultShader; - this.width = renderer.projection.x * 2; - this.height = -renderer.projection.y * 2; + this.width = this.renderer.projection.x * 2; + this.height = -this.renderer.projection.y * 2; this.buffer = buffer; }; diff --git a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js index 59c3846..01aa070 100644 --- a/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLFastSpriteBatch.js @@ -10,10 +10,17 @@ /** * @class + * @private * @namespace PIXI + * @param renderer {WebGLRenderer} The renderer this sprite batch works for. */ function WebGLFastSpriteBatch(renderer) { /** + * @member {WebGLRenderer} + */ + this.renderer = renderer; + + /** * @member {number} */ this.vertSize = 10; @@ -100,8 +107,6 @@ */ this.matrix = null; - this.renderer = renderer; - this.setupContext(); } @@ -134,9 +139,8 @@ * @param spriteBatch {WebGLSpriteBatch} * @param renderer {WebGLRenderer|CanvasRenderer} The renderer */ -WebGLFastSpriteBatch.prototype.begin = function (spriteBatch, renderer) { - this.renderer = renderer; - this.shader = renderer.shaderManager.fastShader; +WebGLFastSpriteBatch.prototype.begin = function (spriteBatch) { + this.shader = this.renderer.shaderManager.fastShader; this.matrix = spriteBatch.worldTransform.toArray(true); diff --git a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js index 2e304d1..34b1063 100644 --- a/src/core/renderers/webgl/utils/WebGLSpriteBatch.js +++ b/src/core/renderers/webgl/utils/WebGLSpriteBatch.js @@ -18,8 +18,14 @@ * @class * @private * @namespace PIXI + * @param renderer {WebGLRenderer} The renderer this sprite batch works for. */ -function WebGLSpriteBatch() { +function WebGLSpriteBatch(renderer) { + /** + * @member {WebGLRenderer} + */ + this.renderer = renderer; + /** * @member {number} */ @@ -163,11 +169,10 @@ }; /** - * @param renderer {WebGLRenderer} The renderer + * */ -WebGLSpriteBatch.prototype.begin = function (renderSession) { - this.renderSession = renderSession; - this.shader = this.renderSession.shaderManager.defaultShader; +WebGLSpriteBatch.prototype.begin = function () { + this.shader = this.renderer.shaderManager.defaultShader; this.start(); }; @@ -244,7 +249,7 @@ var colors = this.colors; var positions = this.positions; - if (this.renderSession.roundPixels) { + if (this.renderer.roundPixels) { // xy positions[index] = a * w1 + c * h1 + tx | 0; positions[index+1] = d * h1 + b * w1 + ty | 0; @@ -469,7 +474,7 @@ var start = 0; var currentBaseTexture = null; - var currentBlendMode = this.renderSession.blendModeManager.currentBlendMode; + var currentBlendMode = this.renderer.blendModeManager.currentBlendMode; var currentShader = null; var blendSwap = false; @@ -496,7 +501,7 @@ if ( blendSwap ) { currentBlendMode = nextBlendMode; - this.renderSession.blendModeManager.setBlendMode( currentBlendMode ); + this.renderer.blendModeManager.setBlendMode( currentBlendMode ); } if ( shaderSwap ) { @@ -515,7 +520,7 @@ } // set shader function??? - this.renderSession.shaderManager.setShader(shader); + this.renderer.shaderManager.setShader(shader); if (shader.dirty) { shader.syncUniforms(); @@ -523,11 +528,11 @@ // both thease only need to be set if they are changing.. // set the projection - var projection = this.renderSession.projection; + var projection = this.renderer.projection; gl.uniform2f(shader.projectionVector, projection.x, projection.y); // TODO - this is temprorary! - var offsetVector = this.renderSession.offset; + var offsetVector = this.renderer.offset; gl.uniform2f(shader.offsetVector, offsetVector.x, offsetVector.y); // set the pointers @@ -562,7 +567,7 @@ gl.drawElements(gl.TRIANGLES, size * 6, gl.UNSIGNED_SHORT, startIndex * 6 * 2); // increment the draw count - this.renderSession.drawCount++; + this.renderer.drawCount++; }; /**