Skip to content

Commit 00d8b6a

Browse files
committed
Invoke camera.addToRenderList method
1 parent dc92526 commit 00d8b6a

27 files changed

Lines changed: 67 additions & 13 deletions

src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, camera, parentMatr
3434
return;
3535
}
3636

37+
camera.addToRenderList(src);
38+
3739
var pipeline = renderer.pipelines.set(src.pipeline, src);
3840

3941
var result = GetCalcMatrix(src, camera, parentMatrix);

src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ var BitmapTextWebGLRenderer = function (renderer, src, camera, parentMatrix)
3232
return;
3333
}
3434

35+
camera.addToRenderList(src);
36+
3537
var pipeline = renderer.pipelines.set(src.pipeline, src);
3638

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

src/gameobjects/blitter/BlitterWebGLRenderer.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ var BlitterWebGLRenderer = function (renderer, src, camera, parentMatrix)
2929

3030
if (list.length === 0)
3131
{
32-
return;
32+
return src.clearRenderDepth(camera);
3333
}
3434

35+
src.setRenderDepth(camera);
36+
3537
var pipeline = renderer.pipelines.set(this.pipeline, src);
3638

3739
var cameraScrollX = camera.scrollX * src.scrollFactorX;

src/gameobjects/container/Container.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,6 @@ var Container = new Class({
170170
*/
171171
this.tempTransformMatrix = new Components.TransformMatrix();
172172

173-
/**
174-
* A reference to the Scene Display List.
175-
*
176-
* @name Phaser.GameObjects.Container#_displayList
177-
* @type {Phaser.GameObjects.DisplayList}
178-
* @private
179-
* @since 3.4.0
180-
*/
181-
this._displayList = scene.sys.displayList;
182-
183173
/**
184174
* The property key to sort by.
185175
*
@@ -454,13 +444,25 @@ var Container = new Class({
454444

455445
if (this.exclusive)
456446
{
457-
this._displayList.remove(gameObject);
447+
if (gameObject.displayList)
448+
{
449+
gameObject.displayList.remove(gameObject);
450+
}
458451

459452
if (gameObject.parentContainer)
460453
{
461454
gameObject.parentContainer.remove(gameObject);
462455
}
463456

457+
if (this.displayList)
458+
{
459+
gameObject.displayList = this.displayList;
460+
}
461+
else
462+
{
463+
gameObject.displayList = this.scene.sys.displayList;
464+
}
465+
464466
gameObject.parentContainer = this;
465467
}
466468

@@ -1361,7 +1363,6 @@ var Container = new Class({
13611363
this.tempTransformMatrix.destroy();
13621364

13631365
this.list = [];
1364-
this._displayList = null;
13651366
}
13661367

13671368
});

src/gameobjects/graphics/GraphicsWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ var GraphicsWebGLRenderer = function (renderer, src, camera, parentMatrix)
4747
return;
4848
}
4949

50+
camera.addToRenderList(src);
51+
5052
var pipeline = renderer.pipelines.set(src.pipeline, src);
5153

5254
renderer.pipelines.preBatch(src);

src/gameobjects/image/ImageWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
*/
2121
var ImageWebGLRenderer = function (renderer, src, camera, parentMatrix)
2222
{
23+
camera.addToRenderList(src);
24+
2325
this.pipeline.batchSprite(src, camera, parentMatrix);
2426
};
2527

src/gameobjects/mesh/MeshWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ var MeshWebGLRenderer = function (renderer, src, camera, parentMatrix)
3030
return;
3131
}
3232

33+
camera.addToRenderList(src);
34+
3335
var pipeline = renderer.pipelines.set(src.pipeline, src);
3436

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

src/gameobjects/particles/ParticleManagerWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, camera, p
7575
continue;
7676
}
7777

78+
camera.addToRenderList(emitter);
79+
7880
var scrollFactorX = emitter.scrollFactorX;
7981
var scrollFactorY = emitter.scrollFactorY;
8082

src/gameobjects/pointlight/PointLightWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ var GetCalcMatrix = require('../GetCalcMatrix');
2222
*/
2323
var PointLightWebGLRenderer = function (renderer, src, camera, parentMatrix)
2424
{
25+
camera.addToRenderList(src);
26+
2527
var pipeline = renderer.pipelines.set(src.pipeline);
2628

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

src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ var Utils = require('../../renderer/webgl/Utils');
2222
*/
2323
var RenderTextureWebGLRenderer = function (renderer, src, camera, parentMatrix)
2424
{
25+
camera.addToRenderList(src);
26+
2527
var cameraAlpha = camera.alpha;
2628

2729
var renderTarget = src.renderTarget;

0 commit comments

Comments
 (0)