Skip to content

Commit d544701

Browse files
committed
parentMatrix added to individual game object render function
1 parent 5d7e910 commit d544701

11 files changed

Lines changed: 32 additions & 20 deletions

File tree

src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ var GameObject = require('../../GameObject');
1919
* @param {Phaser.GameObjects.DynamicBitmapText} gameObject - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var DynamicBitmapTextWebGLRenderer = function (renderer, bitmapText, interpolationPercentage, camera)
24+
var DynamicBitmapTextWebGLRenderer = function (renderer, bitmapText, interpolationPercentage, camera, parentMatrix)
2425
{
2526
var text = bitmapText.text;
2627
var textLength = text.length;
@@ -30,7 +31,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, bitmapText, interpolati
3031
return;
3132
}
3233

33-
this.pipeline.batchDynamicBitmapText(bitmapText, camera);
34+
this.pipeline.batchDynamicBitmapText(bitmapText, camera, parentMatrix);
3435
};
3536

3637
module.exports = DynamicBitmapTextWebGLRenderer;

src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ var GameObject = require('../../GameObject');
1919
* @param {Phaser.GameObjects.BitmapText} gameObject - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
24+
var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera, parentMatrix)
2425
{
2526
var text = gameObject.text;
2627
var textLength = text.length;
@@ -30,7 +31,7 @@ var BitmapTextWebGLRenderer = function (renderer, gameObject, interpolationPerce
3031
return;
3132
}
3233

33-
this.pipeline.batchBitmapText(this, camera);
34+
this.pipeline.batchBitmapText(this, camera, parentMatrix);
3435
};
3536

3637
module.exports = BitmapTextWebGLRenderer;

src/gameobjects/blitter/BlitterWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Blitter} gameObject - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var BlitterWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera)
24+
var BlitterWebGLRenderer = function (renderer, gameObject, interpolationPercentage, camera, parentMatrix)
2425
{
2526
if (GameObject.RENDER_MASK !== gameObject.renderFlags || (gameObject.cameraFilter > 0 && (gameObject.cameraFilter & camera._id)))
2627
{
2728
return;
2829
}
2930

30-
this.pipeline.drawBlitter(gameObject, camera);
31+
this.pipeline.drawBlitter(gameObject, camera, parentMatrix);
3132
};
3233

3334
module.exports = BlitterWebGLRenderer;

src/gameobjects/graphics/GraphicsWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Graphics} graphics - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var GraphicsWebGLRenderer = function (renderer, graphics, interpolationPercentage, camera)
24+
var GraphicsWebGLRenderer = function (renderer, graphics, interpolationPercentage, camera, parentMatrix)
2425
{
2526
if (GameObject.RENDER_MASK !== graphics.renderFlags || (graphics.cameraFilter > 0 && (graphics.cameraFilter & camera._id)))
2627
{
2728
return;
2829
}
2930

30-
this.pipeline.batchGraphics(this, camera);
31+
this.pipeline.batchGraphics(this, camera, parentMatrix);
3132
};
3233

3334
module.exports = GraphicsWebGLRenderer;

src/gameobjects/image/ImageWebGLRenderer.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Image} src - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
2324
var ImageWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2425
{

src/gameobjects/mesh/MeshWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Mesh} src - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var MeshWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
24+
var MeshWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2425
{
2526
if (GameObject.RENDER_MASK !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
2627
{
2728
return;
2829
}
2930

30-
this.pipeline.batchMesh(src, camera);
31+
this.pipeline.batchMesh(src, camera, parentMatrix);
3132
};
3233

3334
module.exports = MeshWebGLRenderer;

src/gameobjects/particles/ParticleManagerWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Particles} emitterManager - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var ParticleManagerWebGLRenderer = function (renderer, emitterManager, interpolationPercentage, camera)
24+
var ParticleManagerWebGLRenderer = function (renderer, emitterManager, interpolationPercentage, camera, parentMatrix)
2425
{
2526
var emitters = emitterManager.emitters;
2627

@@ -29,7 +30,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, interpola
2930
return;
3031
}
3132

32-
this.pipeline.drawEmitterManager(emitterManager, camera);
33+
this.pipeline.drawEmitterManager(emitterManager, camera, parentMatrix);
3334
};
3435

3536
module.exports = ParticleManagerWebGLRenderer;

src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ var Utils = require('../../renderer/webgl/Utils');
2020
* @param {Phaser.GameObjects.RenderTexture} renderTexture - The Game Object being rendered in this call.
2121
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2222
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
23+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2324
*/
24-
var RenderTextureWebGLRenderer = function (renderer, renderTexture, interpolationPercentage, camera)
25+
var RenderTextureWebGLRenderer = function (renderer, renderTexture, interpolationPercentage, camera, parentMatrix)
2526
{
2627
if (GameObject.RENDER_MASK !== renderTexture.renderFlags || (renderTexture.cameraFilter > 0 && (renderTexture.cameraFilter & camera._id)))
2728
{
@@ -42,7 +43,8 @@ var RenderTextureWebGLRenderer = function (renderer, renderTexture, interpolatio
4243
0, 0, renderTexture.texture.width, renderTexture.texture.height,
4344
Utils.getTintAppendFloatAlpha(renderTexture.tintTopLeft, renderTexture.alphaTopLeft), Utils.getTintAppendFloatAlpha(renderTexture.tintTopRight, renderTexture.alphaTopRight), Utils.getTintAppendFloatAlpha(renderTexture.tintBottomLeft, renderTexture.alphaBottomLeft), Utils.getTintAppendFloatAlpha(renderTexture.tintBottomRight, renderTexture.alphaBottomRight),
4445
0, 0,
45-
camera
46+
camera,
47+
parentMatrix
4648
);
4749
};
4850

src/gameobjects/sprite/SpriteWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,16 @@ var GameObject = require('../GameObject');
1919
* @param {Phaser.GameObjects.Sprite} src - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var SpriteWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
24+
var SpriteWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2425
{
2526
if (GameObject.RENDER_MASK !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)))
2627
{
2728
return;
2829
}
2930

30-
this.pipeline.batchSprite(src, camera);
31+
this.pipeline.batchSprite(src, camera, parentMatrix);
3132
};
3233

3334
module.exports = SpriteWebGLRenderer;

src/gameobjects/text/static/TextWebGLRenderer.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ var GameObject = require('../../GameObject');
1919
* @param {Phaser.GameObjects.Text} src - The Game Object being rendered in this call.
2020
* @param {number} interpolationPercentage - Reserved for future use and custom pipelines.
2121
* @param {Phaser.Cameras.Scene2D.Camera} camera - The Camera that is rendering the Game Object.
22+
* @param {Phaser.GameObjects.Components.TransformMatrix} parentMatrix - This transform matrix is defined if the game object is nested
2223
*/
23-
var TextWebGLRenderer = function (renderer, src, interpolationPercentage, camera)
24+
var TextWebGLRenderer = function (renderer, src, interpolationPercentage, camera, parentMatrix)
2425
{
2526
if (GameObject.RENDER_MASK !== src.renderFlags || (src.cameraFilter > 0 && (src.cameraFilter & camera._id)) || src.text === '')
2627
{
@@ -33,7 +34,7 @@ var TextWebGLRenderer = function (renderer, src, interpolationPercentage, camera
3334
src.dirty = false;
3435
}
3536

36-
this.pipeline.batchText(this, camera);
37+
this.pipeline.batchText(this, camera, parentMatrix);
3738
};
3839

3940
module.exports = TextWebGLRenderer;

0 commit comments

Comments
 (0)