Skip to content

Commit 4ade25f

Browse files
photonstormphotonstorm
committed
No longer read private values for tint
The `Multi Pipeline`, `Bitmap Text`, `Render Texture`, `Text`, `TileSprite` and `Camera` now all read the tint values from the public properties instead of the private `_tintTL` etc ones. They also now set the `tintEffect` value directly from the `tintFill` property, removing another conditional check.
1 parent 75c5f11 commit 4ade25f

7 files changed

Lines changed: 39 additions & 40 deletions

File tree

‎src/gameobjects/bitmaptext/dynamic/DynamicBitmapTextWebGLRenderer.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
var Utils = require('../../../renderer/webgl/Utils');
8-
var GetColorFromValue = require('../../../display/color/GetColorFromValue');
98

109
/**
1110
* Renders this Game Object with the WebGL Renderer to the given Camera.
@@ -85,11 +84,11 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPerce
8584
var textureWidth = texture.width;
8685
var textureHeight = texture.height;
8786

88-
var tintEffect = (src._isTinted && src.tintFill);
89-
var tintTL = Utils.getTintAppendFloatAlpha(src._tintTL, camera.alpha * src._alphaTL);
90-
var tintTR = Utils.getTintAppendFloatAlpha(src._tintTR, camera.alpha * src._alphaTR);
91-
var tintBL = Utils.getTintAppendFloatAlpha(src._tintBL, camera.alpha * src._alphaBL);
92-
var tintBR = Utils.getTintAppendFloatAlpha(src._tintBR, camera.alpha * src._alphaBR);
87+
var tintEffect = src.tintFill;
88+
var tintTL = Utils.getTintAppendFloatAlpha(src.tintTopLeft, camera.alpha * src._alphaTL);
89+
var tintTR = Utils.getTintAppendFloatAlpha(src.tintTopRight, camera.alpha * src._alphaTR);
90+
var tintBL = Utils.getTintAppendFloatAlpha(src.tintBottomLeft, camera.alpha * src._alphaBL);
91+
var tintBR = Utils.getTintAppendFloatAlpha(src.tintBottomRight, camera.alpha * src._alphaBR);
9392

9493
var textureUnit = pipeline.setGameObject(src);
9594

@@ -232,10 +231,10 @@ var DynamicBitmapTextWebGLRenderer = function (renderer, src, interpolationPerce
232231
tintBR = output.tint.bottomRight;
233232
}
234233

235-
tintTL = Utils.getTintAppendFloatAlpha(GetColorFromValue(tintTL), camera.alpha * src._alphaTL);
236-
tintTR = Utils.getTintAppendFloatAlpha(GetColorFromValue(tintTR), camera.alpha * src._alphaTR);
237-
tintBL = Utils.getTintAppendFloatAlpha(GetColorFromValue(tintBL), camera.alpha * src._alphaBL);
238-
tintBR = Utils.getTintAppendFloatAlpha(GetColorFromValue(tintBR), camera.alpha * src._alphaBR);
234+
tintTL = Utils.getTintAppendFloatAlpha(tintTL, camera.alpha * src._alphaTL);
235+
tintTR = Utils.getTintAppendFloatAlpha(tintTR, camera.alpha * src._alphaTR);
236+
tintBL = Utils.getTintAppendFloatAlpha(tintBL, camera.alpha * src._alphaBL);
237+
tintBR = Utils.getTintAppendFloatAlpha(tintBR, camera.alpha * src._alphaBR);
239238
}
240239

241240
x *= scale;

‎src/gameobjects/bitmaptext/static/BitmapTextWebGLRenderer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ var BitmapTextWebGLRenderer = function (renderer, src, interpolationPercentage,
6969

7070
var charColors = src.charColors;
7171

72-
var tintEffect = (src._isTinted && src.tintFill);
72+
var tintEffect = src.tintFill;
7373

74-
var tintTL = Utils.getTintAppendFloatAlpha(src._tintTL, cameraAlpha * src._alphaTL);
75-
var tintTR = Utils.getTintAppendFloatAlpha(src._tintTR, cameraAlpha * src._alphaTR);
76-
var tintBL = Utils.getTintAppendFloatAlpha(src._tintBL, cameraAlpha * src._alphaBL);
77-
var tintBR = Utils.getTintAppendFloatAlpha(src._tintBR, cameraAlpha * src._alphaBR);
74+
var tintTL = Utils.getTintAppendFloatAlpha(src.tintTopLeft, cameraAlpha * src._alphaTL);
75+
var tintTR = Utils.getTintAppendFloatAlpha(src.tintTopRight, cameraAlpha * src._alphaTR);
76+
var tintBL = Utils.getTintAppendFloatAlpha(src.tintBottomLeft, cameraAlpha * src._alphaBL);
77+
var tintBR = Utils.getTintAppendFloatAlpha(src.tintBottomRight, cameraAlpha * src._alphaBR);
7878

7979
var texture = src.frame.glTexture;
8080
var textureUnit = pipeline.setGameObject(src);

‎src/gameobjects/rendertexture/RenderTextureWebGLRenderer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ var RenderTextureWebGLRenderer = function (renderer, src, interpolationPercentag
4343
src.scrollFactorX, src.scrollFactorY,
4444
src.displayOriginX, src.displayOriginY,
4545
0, 0, width, height,
46-
getTint(src._tintTL, camera.alpha * src._alphaTL),
47-
getTint(src._tintTR, camera.alpha * src._alphaTR),
48-
getTint(src._tintBL, camera.alpha * src._alphaBL),
49-
getTint(src._tintBR, camera.alpha * src._alphaBR),
50-
(src._isTinted && src.tintFill),
46+
getTint(src.tintTopLeft, camera.alpha * src._alphaTL),
47+
getTint(src.tintTopRight, camera.alpha * src._alphaTR),
48+
getTint(src.tintBottomLeft, camera.alpha * src._alphaBL),
49+
getTint(src.tintBottomRight, camera.alpha * src._alphaBR),
50+
src.tintFill,
5151
0, 0,
5252
camera,
5353
parentMatrix,

‎src/gameobjects/text/static/TextWebGLRenderer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ var TextWebGLRenderer = function (renderer, src, interpolationPercentage, camera
4848
src.scrollFactorX, src.scrollFactorY,
4949
src.displayOriginX, src.displayOriginY,
5050
0, 0, width, height,
51-
getTint(src._tintTL, camera.alpha * src._alphaTL),
52-
getTint(src._tintTR, camera.alpha * src._alphaTR),
53-
getTint(src._tintBL, camera.alpha * src._alphaBL),
54-
getTint(src._tintBR, camera.alpha * src._alphaBR),
55-
(src._isTinted && src.tintFill),
51+
getTint(src.tintTopLeft, camera.alpha * src._alphaTL),
52+
getTint(src.tintTopRight, camera.alpha * src._alphaTR),
53+
getTint(src.tintBottomLeft, camera.alpha * src._alphaBL),
54+
getTint(src.tintBottomRight, camera.alpha * src._alphaBR),
55+
src.tintFill,
5656
0, 0,
5757
camera,
5858
parentMatrix,

‎src/gameobjects/tilesprite/TileSpriteWebGLRenderer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ var TileSpriteWebGLRenderer = function (renderer, src, interpolationPercentage,
5050
src.scrollFactorX, src.scrollFactorY,
5151
src.originX * width, src.originY * height,
5252
0, 0, width, height,
53-
getTint(src._tintTL, camera.alpha * src._alphaTL),
54-
getTint(src._tintTR, camera.alpha * src._alphaTR),
55-
getTint(src._tintBL, camera.alpha * src._alphaBL),
56-
getTint(src._tintBR, camera.alpha * src._alphaBR),
57-
(src._isTinted && src.tintFill),
53+
getTint(src.tintTopLeft, camera.alpha * src._alphaTL),
54+
getTint(src.tintTopRight, camera.alpha * src._alphaTR),
55+
getTint(src.tintBottomLeft, camera.alpha * src._alphaBL),
56+
getTint(src.tintBottomRight, camera.alpha * src._alphaBR),
57+
src.tintFill,
5858
(src.tilePositionX % src.displayFrame.width) / src.displayFrame.width,
5959
(src.tilePositionY % src.displayFrame.height) / src.displayFrame.height,
6060
camera,

‎src/renderer/webgl/WebGLRenderer.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2114,11 +2114,11 @@ var WebGLRenderer = new Class({
21142114
1, 1,
21152115
0, 0,
21162116
0, 0, camera.width, camera.height,
2117-
getTint(camera._tintTL, camera._alphaTL),
2118-
getTint(camera._tintTR, camera._alphaTR),
2119-
getTint(camera._tintBL, camera._alphaBL),
2120-
getTint(camera._tintBR, camera._alphaBR),
2121-
(camera._isTinted && camera.tintFill),
2117+
getTint(camera.tintTopLeft, camera._alphaTL),
2118+
getTint(camera.tintTopRight, camera._alphaTR),
2119+
getTint(camera.tintBottomLeft, camera._alphaBL),
2120+
getTint(camera.tintBottomRight, camera._alphaBR),
2121+
camera.tintFill,
21222122
0, 0,
21232123
this.defaultCamera,
21242124
null

‎src/renderer/webgl/pipelines/MultiPipeline.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -528,10 +528,10 @@ var MultiPipeline = new Class({
528528
var tx3 = calcMatrix.getX(xw, y);
529529
var ty3 = calcMatrix.getY(xw, y);
530530

531-
var tintTL = Utils.getTintAppendFloatAlpha(sprite._tintTL, camera.alpha * sprite._alphaTL);
532-
var tintTR = Utils.getTintAppendFloatAlpha(sprite._tintTR, camera.alpha * sprite._alphaTR);
533-
var tintBL = Utils.getTintAppendFloatAlpha(sprite._tintBL, camera.alpha * sprite._alphaBL);
534-
var tintBR = Utils.getTintAppendFloatAlpha(sprite._tintBR, camera.alpha * sprite._alphaBR);
531+
var tintTL = Utils.getTintAppendFloatAlpha(sprite.tintTopLeft, camera.alpha * sprite._alphaTL);
532+
var tintTR = Utils.getTintAppendFloatAlpha(sprite.tintTopRight, camera.alpha * sprite._alphaTR);
533+
var tintBL = Utils.getTintAppendFloatAlpha(sprite.tintBottomLeft, camera.alpha * sprite._alphaBL);
534+
var tintBR = Utils.getTintAppendFloatAlpha(sprite.tintBottomRight, camera.alpha * sprite._alphaBR);
535535

536536
if (camera.roundPixels)
537537
{
@@ -556,7 +556,7 @@ var MultiPipeline = new Class({
556556

557557
var unit = this.setGameObject(sprite);
558558

559-
var tintEffect = (sprite._isTinted && sprite.tintFill);
559+
var tintEffect = sprite.tintFill;
560560

561561
this.batchQuad(tx0, ty0, tx1, ty1, tx2, ty2, tx3, ty3, u0, v0, u1, v1, tintTL, tintTR, tintBL, tintBR, tintEffect, texture, unit);
562562
},

0 commit comments

Comments
 (0)