parentTransformMatrix argument added to texture pipeline

bitnenfer · bitnenfer · commit eac2b8338ee3 · 2018-03-26T17:23:18.000-03:00
diff --git a/src/gameobjects/container/Container.js b/src/gameobjects/container/Container.js
@@ -30,6 +30,17 @@ var Container = new Class({
         {
             this.children.push(gameObject);
         }
+        return this;
+    },
+
+    remove: function (gameObject)
+    {
+        var index = this.children.indexOf(gameObject);
+        if (index >= 0)
+        {
+            this.children.splice(index, 1);
+        }
+        return this;
     }
 
 });
diff --git a/src/renderer/webgl/pipelines/TextureTintPipeline.js b/src/renderer/webgl/pipelines/TextureTintPipeline.js
@@ -366,8 +366,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.Particles.ParticleEmitterManager} emitterManager - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    drawEmitterManager: function (emitterManager, camera)
+    drawEmitterManager: function (emitterManager, camera, parentTransformMatrix)
     {
         this.renderer.setPipeline(this);
 
@@ -530,8 +531,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.Blitter} blitter - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    drawBlitter: function (blitter, camera)
+    drawBlitter: function (blitter, camera, parentTransformMatrix)
     {
         this.renderer.setPipeline(this);
 
@@ -651,6 +653,7 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.Sprite} sprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
     batchSprite: function (sprite, camera, parentTransformMatrix)
     {
@@ -806,8 +809,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.Mesh} mesh - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchMesh: function (mesh, camera)
+    batchMesh: function (mesh, camera, parentTransformMatrix)
     {
         var vertices = mesh.vertices;
         var length = vertices.length;
@@ -895,8 +899,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.BitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchBitmapText: function (bitmapText, camera)
+    batchBitmapText: function (bitmapText, camera, parentTransformMatrix)
     {
         this.renderer.setPipeline(this);
 
@@ -1129,8 +1134,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.DynamicBitmapText} bitmapText - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchDynamicBitmapText: function (bitmapText, camera)
+    batchDynamicBitmapText: function (bitmapText, camera, parentTransformMatrix)
     {
         this.renderer.setPipeline(this);
 
@@ -1438,8 +1444,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.Text} text - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchText: function (text, camera)
+    batchText: function (text, camera, parentTransformMatrix)
     {
         var getTint = Utils.getTintAppendFloatAlpha;
 
@@ -1472,8 +1479,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.Tilemaps.DynamicTilemapLayer} tilemapLayer - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchDynamicTilemapLayer: function (tilemapLayer, camera)
+    batchDynamicTilemapLayer: function (tilemapLayer, camera, parentTransformMatrix)
     {
         var renderTiles = tilemapLayer.culledTiles;
         var length = renderTiles.length;
@@ -1528,8 +1536,9 @@ var TextureTintPipeline = new Class({
      *
      * @param {Phaser.GameObjects.TileSprite} tileSprite - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
-    batchTileSprite: function (tileSprite, camera)
+    batchTileSprite: function (tileSprite, camera, parentTransformMatrix)
     {
         var getTint = Utils.getTintAppendFloatAlpha;
 
@@ -1589,6 +1598,7 @@ var TextureTintPipeline = new Class({
      * @param {float} uOffset - [description]
      * @param {float} vOffset - [description]
      * @param {Phaser.Cameras.Scene2D.Camera} camera - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      */
     batchTexture: function (
         gameObject,
@@ -1604,7 +1614,8 @@ var TextureTintPipeline = new Class({
         frameX, frameY, frameWidth, frameHeight,
         tintTL, tintTR, tintBL, tintBR,
         uOffset, vOffset,
-        camera)
+        camera, 
+        parentTransformMatrix)
     {
         this.renderer.setPipeline(this);
 
@@ -1728,6 +1739,7 @@ var TextureTintPipeline = new Class({
      * @param {number} frameWidth - [description]
      * @param {number} frameHeight - [description]
      * @param {Phaser.GameObjects.Components.TransformMatrix} transformMatrix - [description]
+     * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]
      *
      * @return {Phaser.Renderer.WebGL.TextureTintPipeline} This Pipeline.
      */
@@ -1736,7 +1748,8 @@ var TextureTintPipeline = new Class({
         srcX, srcY,
         tint, alpha,
         frameX, frameY, frameWidth, frameHeight,
-        transformMatrix
+        transformMatrix, 
+        parentTransformMatrix
     )
     {
         this.renderer.setPipeline(this);

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,17 @@ var Container = new Class({`
`30`	`30`	`{`
`31`	`31`	`this.children.push(gameObject);`
`32`	`32`	`}`
	`33`	`+ return this;`
	`34`	`+ },`
	`35`	`+`
	`36`	`+ remove: function (gameObject)`
	`37`	`+ {`
	`38`	`+ var index = this.children.indexOf(gameObject);`
	`39`	`+ if (index >= 0)`
	`40`	`+ {`
	`41`	`+ this.children.splice(index, 1);`
	`42`	`+ }`
	`43`	`+ return this;`
`33`	`44`	`}`
`34`	`45`
`35`	`46`	`});`
Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,9 @@ var TextureTintPipeline = new Class({`
`366`	`366`	`*`
`367`	`367`	`* @param {Phaser.GameObjects.Particles.ParticleEmitterManager} emitterManager - [description]`
`368`	`368`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`369`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`369`	`370`	`*/`
`370`		`- drawEmitterManager: function (emitterManager, camera)`
	`371`	`+ drawEmitterManager: function (emitterManager, camera, parentTransformMatrix)`
`371`	`372`	`{`
`372`	`373`	`this.renderer.setPipeline(this);`
`373`	`374`
`@@ -530,8 +531,9 @@ var TextureTintPipeline = new Class({`
`530`	`531`	`*`
`531`	`532`	`* @param {Phaser.GameObjects.Blitter} blitter - [description]`
`532`	`533`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`534`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`533`	`535`	`*/`
`534`		`- drawBlitter: function (blitter, camera)`
	`536`	`+ drawBlitter: function (blitter, camera, parentTransformMatrix)`
`535`	`537`	`{`
`536`	`538`	`this.renderer.setPipeline(this);`
`537`	`539`
`@@ -651,6 +653,7 @@ var TextureTintPipeline = new Class({`
`651`	`653`	`*`
`652`	`654`	`* @param {Phaser.GameObjects.Sprite} sprite - [description]`
`653`	`655`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`656`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`654`	`657`	`*/`
`655`	`658`	`batchSprite: function (sprite, camera, parentTransformMatrix)`
`656`	`659`	`{`
`@@ -806,8 +809,9 @@ var TextureTintPipeline = new Class({`
`806`	`809`	`*`
`807`	`810`	`* @param {Phaser.GameObjects.Mesh} mesh - [description]`
`808`	`811`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`812`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`809`	`813`	`*/`
`810`		`- batchMesh: function (mesh, camera)`
	`814`	`+ batchMesh: function (mesh, camera, parentTransformMatrix)`
`811`	`815`	`{`
`812`	`816`	`var vertices = mesh.vertices;`
`813`	`817`	`var length = vertices.length;`
`@@ -895,8 +899,9 @@ var TextureTintPipeline = new Class({`
`895`	`899`	`*`
`896`	`900`	`* @param {Phaser.GameObjects.BitmapText} bitmapText - [description]`
`897`	`901`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`902`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`898`	`903`	`*/`
`899`		`- batchBitmapText: function (bitmapText, camera)`
	`904`	`+ batchBitmapText: function (bitmapText, camera, parentTransformMatrix)`
`900`	`905`	`{`
`901`	`906`	`this.renderer.setPipeline(this);`
`902`	`907`
`@@ -1129,8 +1134,9 @@ var TextureTintPipeline = new Class({`
`1129`	`1134`	`*`
`1130`	`1135`	`* @param {Phaser.GameObjects.DynamicBitmapText} bitmapText - [description]`
`1131`	`1136`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`1137`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1132`	`1138`	`*/`
`1133`		`- batchDynamicBitmapText: function (bitmapText, camera)`
	`1139`	`+ batchDynamicBitmapText: function (bitmapText, camera, parentTransformMatrix)`
`1134`	`1140`	`{`
`1135`	`1141`	`this.renderer.setPipeline(this);`
`1136`	`1142`
`@@ -1438,8 +1444,9 @@ var TextureTintPipeline = new Class({`
`1438`	`1444`	`*`
`1439`	`1445`	`* @param {Phaser.GameObjects.Text} text - [description]`
`1440`	`1446`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`1447`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1441`	`1448`	`*/`
`1442`		`- batchText: function (text, camera)`
	`1449`	`+ batchText: function (text, camera, parentTransformMatrix)`
`1443`	`1450`	`{`
`1444`	`1451`	`var getTint = Utils.getTintAppendFloatAlpha;`
`1445`	`1452`
`@@ -1472,8 +1479,9 @@ var TextureTintPipeline = new Class({`
`1472`	`1479`	`*`
`1473`	`1480`	`* @param {Phaser.Tilemaps.DynamicTilemapLayer} tilemapLayer - [description]`
`1474`	`1481`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`1482`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1475`	`1483`	`*/`
`1476`		`- batchDynamicTilemapLayer: function (tilemapLayer, camera)`
	`1484`	`+ batchDynamicTilemapLayer: function (tilemapLayer, camera, parentTransformMatrix)`
`1477`	`1485`	`{`
`1478`	`1486`	`var renderTiles = tilemapLayer.culledTiles;`
`1479`	`1487`	`var length = renderTiles.length;`
`@@ -1528,8 +1536,9 @@ var TextureTintPipeline = new Class({`
`1528`	`1536`	`*`
`1529`	`1537`	`* @param {Phaser.GameObjects.TileSprite} tileSprite - [description]`
`1530`	`1538`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`1539`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1531`	`1540`	`*/`
`1532`		`- batchTileSprite: function (tileSprite, camera)`
	`1541`	`+ batchTileSprite: function (tileSprite, camera, parentTransformMatrix)`
`1533`	`1542`	`{`
`1534`	`1543`	`var getTint = Utils.getTintAppendFloatAlpha;`
`1535`	`1544`
`@@ -1589,6 +1598,7 @@ var TextureTintPipeline = new Class({`
`1589`	`1598`	`* @param {float} uOffset - [description]`
`1590`	`1599`	`* @param {float} vOffset - [description]`
`1591`	`1600`	`* @param {Phaser.Cameras.Scene2D.Camera} camera - [description]`
	`1601`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1592`	`1602`	`*/`
`1593`	`1603`	`batchTexture: function (`
`1594`	`1604`	`gameObject,`
`@@ -1604,7 +1614,8 @@ var TextureTintPipeline = new Class({`
`1604`	`1614`	`frameX, frameY, frameWidth, frameHeight,`
`1605`	`1615`	`tintTL, tintTR, tintBL, tintBR,`
`1606`	`1616`	`uOffset, vOffset,`
`1607`		`- camera)`
	`1617`	`+ camera,`
	`1618`	`+ parentTransformMatrix)`
`1608`	`1619`	`{`
`1609`	`1620`	`this.renderer.setPipeline(this);`
`1610`	`1621`
`@@ -1728,6 +1739,7 @@ var TextureTintPipeline = new Class({`
`1728`	`1739`	`* @param {number} frameWidth - [description]`
`1729`	`1740`	`* @param {number} frameHeight - [description]`
`1730`	`1741`	`* @param {Phaser.GameObjects.Components.TransformMatrix} transformMatrix - [description]`
	`1742`	`+ * @param {Phaser.GameObjects.Components.TransformMatrix} parentTransformMatrix - [description]`
`1731`	`1743`	`*`
`1732`	`1744`	`* @return {Phaser.Renderer.WebGL.TextureTintPipeline} This Pipeline.`
`1733`	`1745`	`*/`
`@@ -1736,7 +1748,8 @@ var TextureTintPipeline = new Class({`
`1736`	`1748`	`srcX, srcY,`
`1737`	`1749`	`tint, alpha,`
`1738`	`1750`	`frameX, frameY, frameWidth, frameHeight,`
`1739`		`- transformMatrix`
	`1751`	`+ transformMatrix,`
	`1752`	`+ parentTransformMatrix`
`1740`	`1753`	`)`
`1741`	`1754`	`{`
`1742`	`1755`	`this.renderer.setPipeline(this);`