Skip to content

Commit 0ee1338

Browse files
committed
Better post pipeline call (less code)
1 parent 339b4fd commit 0ee1338

26 files changed

Lines changed: 58 additions & 252 deletions

src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, camera, parentMatr
115115
var displayCallback = src.displayCallback;
116116
var callbackData = src.callbackData;
117117

118-
var postPipeline = (src && src.hasPostPipeline);
119-
120-
if (postPipeline)
121-
{
122-
renderer.pipelines.preBatch(src);
123-
}
118+
renderer.pipelines.preBatch(src);
124119

125120
for (var i = 0; i < textLength; i++)
126121
{
@@ -279,10 +274,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, camera, parentMatr
279274
renderer.popScissor();
280275
}
281276

282-
if (postPipeline)
283-
{
284-
renderer.pipelines.postBatch(src);
285-
}
277+
renderer.pipelines.postBatch(src);
286278
};
287279

288280
module.exports = DynamicBitmapTextWebGLRenderer;

src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,7 @@ var BitmapTextWebGLRenderer = function (renderer, src, camera, parentMatrix)
6666

6767
var dropShadow = (dropShadowX !== 0 || dropShadowY !== 0);
6868

69-
var postPipeline = (src && src.hasPostPipeline);
70-
71-
if (postPipeline)
72-
{
73-
renderer.pipelines.preBatch(src);
74-
}
69+
renderer.pipelines.preBatch(src);
7570

7671
if (dropShadow)
7772
{
@@ -128,10 +123,7 @@ var BitmapTextWebGLRenderer = function (renderer, src, camera, parentMatrix)
128123
// pipeline.drawFillRect(tx0, ty0, tx2 - tx0, ty2 - ty0, 0x00ff00, 0.5);
129124
}
130125

131-
if (postPipeline)
132-
{
133-
renderer.pipelines.postBatch(src);
134-
}
126+
renderer.pipelines.postBatch(src);
135127
};
136128

137129
module.exports = BitmapTextWebGLRenderer;

src/gameobjects/blitter/BlitterWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ var BlitterWebGLRenderer = function (renderer, src, camera, parentMatrix)
5454
var alpha = camera.alpha * src.alpha;
5555
var roundPixels = camera.roundPixels;
5656

57-
var postPipeline = (src && src.hasPostPipeline);
58-
59-
if (postPipeline)
60-
{
61-
renderer.pipelines.preBatch(src);
62-
}
57+
renderer.pipelines.preBatch(src);
6358

6459
for (var index = 0; index < list.length; index++)
6560
{
@@ -125,10 +120,7 @@ var BlitterWebGLRenderer = function (renderer, src, camera, parentMatrix)
125120
}
126121
}
127122

128-
if (postPipeline)
129-
{
130-
renderer.pipelines.postBatch(src);
131-
}
123+
renderer.pipelines.postBatch(src);
132124
};
133125

134126
module.exports = BlitterWebGLRenderer;

src/gameobjects/container/ContainerWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,7 @@ var ContainerWebGLRenderer = function (renderer, container, camera, parentMatrix
4444
transformMatrix.applyITRS(container.x, container.y, container.rotation, container.scaleX, container.scaleY);
4545
}
4646

47-
var postPipeline = (container && container.hasPostPipeline);
48-
49-
if (postPipeline)
50-
{
51-
renderer.pipelines.preBatch(container);
52-
}
47+
renderer.pipelines.preBatch(container);
5348

5449
var containerHasBlendMode = (container.blendMode !== -1);
5550

@@ -143,10 +138,7 @@ var ContainerWebGLRenderer = function (renderer, container, camera, parentMatrix
143138
renderer.newType = false;
144139
}
145140

146-
if (postPipeline)
147-
{
148-
renderer.pipelines.postBatch(container);
149-
}
141+
renderer.pipelines.postBatch(container);
150142
};
151143

152144
module.exports = ContainerWebGLRenderer;

src/gameobjects/graphics/GraphicsWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,7 @@ var GraphicsWebGLRenderer = function (renderer, src, camera, parentMatrix)
4949

5050
var pipeline = renderer.pipelines.set(src.pipeline, src);
5151

52-
var postPipeline = (src && src.hasPostPipeline);
53-
54-
if (postPipeline)
55-
{
56-
renderer.pipelines.preBatch(src);
57-
}
52+
renderer.pipelines.preBatch(src);
5853

5954
var calcMatrix = GetCalcMatrix(src, camera, parentMatrix).calc;
6055

@@ -346,10 +341,7 @@ var GraphicsWebGLRenderer = function (renderer, src, camera, parentMatrix)
346341
}
347342
}
348343

349-
if (postPipeline)
350-
{
351-
renderer.pipelines.postBatch(src);
352-
}
344+
renderer.pipelines.postBatch(src);
353345
};
354346

355347
module.exports = GraphicsWebGLRenderer;

src/gameobjects/mesh/MeshWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,7 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
6161

6262
var totalFacesRendered = 0;
6363

64-
var postPipeline = (src && src.hasPostPipeline && !src.manualPostPipeline);
65-
66-
if (postPipeline)
67-
{
68-
renderer.pipelines.preBatch(src);
69-
}
64+
renderer.pipelines.preBatch(src);
7065

7166
for (var i = 0; i < totalFaces; i++)
7267
{
@@ -103,10 +98,7 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
10398
debugCallback.call(src, src, debugFaces);
10499
}
105100

106-
if (postPipeline)
107-
{
108-
renderer.pipelines.postBatch(src);
109-
}
101+
renderer.pipelines.postBatch(src);
110102
};
111103

112104
module.exports = MeshWebGLRenderer;

src/gameobjects/particles/ParticleManagerWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, camera, p
6262

6363
var textureUnit = pipeline.setGameObject(emitterManager, emitterManager.defaultFrame);
6464

65-
var postPipeline = (emitterManager && emitterManager.hasPostPipeline);
66-
67-
if (postPipeline)
68-
{
69-
renderer.pipelines.preBatch(emitterManager);
70-
}
65+
renderer.pipelines.preBatch(emitterManager);
7166

7267
for (var e = 0; e < emittersLength; e++)
7368
{
@@ -151,10 +146,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, camera, p
151146
}
152147
}
153148

154-
if (postPipeline)
155-
{
156-
renderer.pipelines.postBatch(emitterManager);
157-
}
149+
renderer.pipelines.postBatch(emitterManager);
158150
};
159151

160152
module.exports = ParticleManagerWebGLRenderer;

src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,7 @@ var RenderTextureWebGLRenderer = function (renderer, src, camera, parentMatrix)
3434

3535
var textureUnit = pipeline.setTexture2D(renderTarget.texture);
3636

37-
var postPipeline = (src && src.hasPostPipeline);
38-
39-
if (postPipeline)
40-
{
41-
renderer.pipelines.preBatch(src);
42-
}
37+
renderer.pipelines.preBatch(src);
4338

4439
src.pipeline.batchTexture(
4540
src,
@@ -67,10 +62,7 @@ var RenderTextureWebGLRenderer = function (renderer, src, camera, parentMatrix)
6762

6863
renderer.resetTextures();
6964

70-
if (postPipeline)
71-
{
72-
renderer.pipelines.postBatch(src);
73-
}
65+
renderer.pipelines.postBatch(src);
7466
};
7567

7668
module.exports = RenderTextureWebGLRenderer;

src/gameobjects/rope/RopeWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ var RopeWebGLRenderer = function (renderer, src, camera, parentMatrix)
4141
// Because it's a triangle strip and we don't want lots of degenerate triangles joining things up
4242
pipeline.flush();
4343

44-
var postPipeline = (src && src.hasPostPipeline);
45-
46-
if (postPipeline)
47-
{
48-
renderer.pipelines.preBatch(src);
49-
}
44+
renderer.pipelines.preBatch(src);
5045

5146
var textureUnit = pipeline.setGameObject(src);
5247

@@ -105,10 +100,7 @@ var RopeWebGLRenderer = function (renderer, src, camera, parentMatrix)
105100

106101
pipeline.vertexCount += vertexCount;
107102

108-
if (postPipeline)
109-
{
110-
renderer.pipelines.postBatch(src);
111-
}
103+
renderer.pipelines.postBatch(src);
112104
};
113105

114106
module.exports = RopeWebGLRenderer;

src/gameobjects/shape/arc/ArcWebGLRenderer.js

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,7 @@ var ArcWebGLRenderer = function (renderer, src, camera, parentMatrix)
3535

3636
var alpha = camera.alpha * src.alpha;
3737

38-
var postPipeline = (src && src.hasPostPipeline);
39-
40-
if (postPipeline)
41-
{
42-
renderer.pipelines.preBatch(src);
43-
}
38+
renderer.pipelines.preBatch(src);
4439

4540
if (src.isFilled)
4641
{
@@ -52,10 +47,7 @@ var ArcWebGLRenderer = function (renderer, src, camera, parentMatrix)
5247
StrokePathWebGL(pipeline, src, alpha, dx, dy);
5348
}
5449

55-
if (postPipeline)
56-
{
57-
renderer.pipelines.postBatch(src);
58-
}
50+
renderer.pipelines.postBatch(src);
5951
};
6052

6153
module.exports = ArcWebGLRenderer;

0 commit comments

Comments
 (0)