Pass Game Object to batchQuad

photonstorm · photonstorm · commit eee3feb6675b · 2020-11-09T13:19:31.000Z
diff --git a/src/gameobjects/bitmaptext/BatchChar.js b/src/gameobjects/bitmaptext/BatchChar.js
@@ -47,7 +47,7 @@ var BatchChar = function (pipeline, src, char, glyph, offsetX, offsetY, calcMatr
     var tx3 = calcMatrix.getXRound(xw, y, roundPixels);
     var ty3 = calcMatrix.getYRound(xw, y, roundPixels);
 
-    pipeline.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, glyph.u0, glyph.v0, glyph.u1, glyph.v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);
+    pipeline.batchQuad(src, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, glyph.u0, glyph.v0, glyph.u1, glyph.v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);
 };
 
 module.exports = BatchChar;
diff --git a/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js b/src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js
@@ -262,7 +262,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, camera, parentMatr
             ty3 = Math.round(ty3);
         }
 
-        pipeline.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);
+        pipeline.batchQuad(src, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);
     }
 
     if (crop)
diff --git a/src/gameobjects/blitter/BlitterWebGLRenderer.js b/src/gameobjects/blitter/BlitterWebGLRenderer.js
@@ -112,7 +112,7 @@ var BlitterWebGLRenderer = function (renderer, src, camera, parentMatrix)
         }
 
         //  TL x/y, BL x/y, BR x/y, TR x/y
-        if (pipeline.batchQuad(tx0, ty0, tx0, ty1, tx1, ty1, tx1, ty0, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, frame.glTexture, textureUnit))
+        if (pipeline.batchQuad(src, tx0, ty0, tx0, ty1, tx1, ty1, tx1, ty0, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, frame.glTexture, textureUnit))
         {
             prevTextureSourceIndex = -1;
         }
diff --git a/src/gameobjects/particles/ParticleManagerWebGLRenderer.js b/src/gameobjects/particles/ParticleManagerWebGLRenderer.js
@@ -135,7 +135,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, camera, p
 
             var tint = getTint(particle.tint, alpha);
 
-            pipeline.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, texture, textureUnit);
+            pipeline.batchQuad(emitter, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, texture, textureUnit);
         }
 
         if (emitter.mask)
diff --git a/src/renderer/webgl/WebGLPipeline.js b/src/renderer/webgl/WebGLPipeline.js
@@ -1223,7 +1223,7 @@ var WebGLPipeline = new Class({
             v1 = 0;
         }
 
-        this.batchQuad(x, y, x, yh, xw, yh, xw, y, u0, v0, u1, v1, tint, tint, tint, tint, 0, texture, unit);
+        this.batchQuad(null, x, y, x, yh, xw, yh, xw, y, u0, v0, u1, v1, tint, tint, tint, tint, 0, texture, unit);
     },
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, camera, parentMatr`
`262`	`262`	`ty3 = Math.round(ty3);`
`263`	`263`	`}`
`264`	`264`
`265`		`- pipeline.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);`
	`265`	`+ pipeline.batchQuad(src, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, textureUnit);`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`if (crop)`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ var BlitterWebGLRenderer = function (renderer, src, camera, parentMatrix)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`// TL x/y, BL x/y, BR x/y, TR x/y`
`115`		`- if (pipeline.batchQuad(tx0, ty0, tx0, ty1, tx1, ty1, tx1, ty0, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, frame.glTexture, textureUnit))`
	`115`	`+ if (pipeline.batchQuad(src, tx0, ty0, tx0, ty1, tx1, ty1, tx1, ty0, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, frame.glTexture, textureUnit))`
`116`	`116`	`{`
`117`	`117`	`prevTextureSourceIndex = -1;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ var ParticleManagerWebGLRenderer = function (renderer, emitterManager, camera, p`
`135`	`135`
`136`	`136`	`var tint = getTint(particle.tint, alpha);`
`137`	`137`
`138`		`- pipeline.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, texture, textureUnit);`
	`138`	`+ pipeline.batchQuad(emitter, tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, frame.u0, frame.v0, frame.u1, frame.v1, tint, tint, tint, tint, tintEffect, texture, textureUnit);`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if (emitter.mask)`
Original file line number	Diff line number	Diff line change
`@@ -1223,7 +1223,7 @@ var WebGLPipeline = new Class({`
`1223`	`1223`	`v1 = 0;`
`1224`	`1224`	`}`
`1225`	`1225`
`1226`		`- this.batchQuad(x, y, x, yh, xw, yh, xw, y, u0, v0, u1, v1, tint, tint, tint, tint, 0, texture, unit);`
	`1226`	`+ this.batchQuad(null, x, y, x, yh, xw, yh, xw, y, u0, v0, u1, v1, tint, tint, tint, tint, 0, texture, unit);`
`1227`	`1227`	`},`
`1228`	`1228`
`1229`	`1229`	`/**`