Skip to content

Commit d198818

Browse files
committed
Game Objects now call the new Pipeline Manager methods directly
1 parent 4ea080e commit d198818

26 files changed

Lines changed: 142 additions & 191 deletions

src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPerce
3232
return;
3333
}
3434

35-
var pipeline = this.pipeline;
36-
37-
renderer.setPipeline(pipeline, src);
35+
var pipeline = renderer.pipelines.set(this.pipeline, src);
3836

3937
var camMatrix = pipeline._tempMatrix1;
4038
var spriteMatrix = pipeline._tempMatrix2;

src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ var BitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage,
3232
return;
3333
}
3434

35-
var pipeline = this.pipeline;
36-
37-
renderer.setPipeline(pipeline, src);
35+
var pipeline = renderer.pipelines.set(this.pipeline, src);
3836

3937
var camMatrix = pipeline._tempMatrix1;
4038
var spriteMatrix = pipeline._tempMatrix2;

src/gameobjects/blitter/BlitterWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ var BlitterWebGLRenderer = function (renderer, src, interpolationPercentage, cam
3030
return;
3131
}
3232

33-
var pipeline = this.pipeline;
34-
35-
renderer.setPipeline(pipeline, src);
33+
var pipeline = renderer.pipelines.set(this.pipeline, src);
3634

3735
var cameraScrollX = camera.scrollX * src.scrollFactorX;
3836
var cameraScrollY = camera.scrollY * src.scrollFactorY;

src/gameobjects/extern/ExternWebGLRenderer.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
*/
2222
var ExternWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2323
{
24-
var pipeline = renderer.currentPipeline;
25-
26-
renderer.clearPipeline();
24+
renderer.pipelines.clear();
2725

2826
var camMatrix = renderer._tempMatrix1;
2927
var spriteMatrix = renderer._tempMatrix2;
@@ -57,7 +55,7 @@ var ExternWebGLRenderer = function (renderer, src, interpolationPercentage, came
5755
// Callback
5856
src.render.call(src, renderer, camera, calcMatrix);
5957

60-
renderer.rebindPipeline(pipeline);
58+
renderer.pipelines.rebind();
6159
};
6260

6361
module.exports = ExternWebGLRenderer;

src/gameobjects/graphics/GraphicsWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,7 @@ var GraphicsWebGLRenderer = function (renderer, src, interpolationPercentage, ca
4747
return;
4848
}
4949

50-
var pipeline = this.pipeline;
51-
52-
renderer.setPipeline(pipeline, src);
50+
var pipeline = renderer.pipelines.set(this.pipeline, src);
5351

5452
var camMatrix = src._tempMatrix1;
5553
var graphicsMatrix = src._tempMatrix2;

src/gameobjects/mesh/MeshWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ var Utils = require('../../renderer/webgl/Utils');
2323
*/
2424
var MeshWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2525
{
26-
var pipeline = this.pipeline;
27-
28-
renderer.setPipeline(pipeline, src);
26+
var pipeline = renderer.pipelines.set(this.pipeline, src);
2927

3028
var camMatrix = pipeline._tempMatrix1;
3129
var spriteMatrix = pipeline._tempMatrix2;

src/gameobjects/particles/ParticleManagerWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, interpola
3131
return;
3232
}
3333

34-
var pipeline = this.pipeline;
34+
var pipeline = renderer.pipelines.set(this.pipeline);
3535

3636
var camMatrix = pipeline._tempMatrix1.copyFrom(camera.matrix);
3737
var calcMatrix = pipeline._tempMatrix2;
@@ -40,8 +40,6 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, interpola
4040

4141
camMatrix.multiply(managerMatrix);
4242

43-
renderer.setPipeline(pipeline);
44-
4543
var roundPixels = camera.roundPixels;
4644
var texture = emitterManager.defaultFrame.glTexture;
4745
var getTint = Utils.getTintAppendFloatAlphaAndSwap;

src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ var RenderTextureWebGLRenderer = function (renderer, src, interpolationPercentag
2727
var width = frame.width;
2828
var height = frame.height;
2929
var getTint = Utils.getTintAppendFloatAlpha;
30-
var pipeline = src.pipeline;
31-
32-
renderer.setPipeline(pipeline, src);
30+
var pipeline = renderer.pipelines.set(src.pipeline, src);
3331

3432
var textureUnit = pipeline.setTexture2D(frame.glTexture, src);
3533

src/gameobjects/rope/RopeWebGLRenderer.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ var Utils = require('../../renderer/webgl/Utils');
2323
*/
2424
var RopeWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2525
{
26-
var pipeline = src.pipeline;
27-
28-
renderer.setPipeline(pipeline, src);
26+
var pipeline = renderer.pipelines.set(src.pipeline, src);
2927

3028
var camMatrix = pipeline._tempMatrix1;
3129
var spriteMatrix = pipeline._tempMatrix2;

0 commit comments

Comments
 (0)