Skip to content

Commit 9173ed8

Browse files
committed
Fixed tint issue
1 parent fe22495 commit 9173ed8

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

src/renderer/webgl/Utils.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ module.exports = {
77
var ub = ((b * 255.0)|0) & 0xFF;
88
var ua = ((a * 255.0)|0) & 0xFF;
99

10-
return ((ua << 24) | (ub << 16) | (ug << 8) | ur) >>> 0;
10+
return ((ua << 24) | (ur << 16) | (ug << 8) | ub) >>> 0;
1111
},
1212

1313
getTintAppendFloatAlpha: function (rgb, a)
14+
{
15+
var ua = ((a * 255.0)|0) & 0xFF;
16+
return ((ua << 24) | rgb) >>> 0;
17+
},
18+
19+
getTintAppendFloatAlphaAndSwap: function (rgb, a)
1420
{
1521
var ur = ((rgb >> 16)|0) & 0xff;
1622
var ug = ((rgb >> 8)|0) & 0xff;

src/renderer/webgl/pipelines/FlatTintPipeline.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ var FlatTintPipeline = new Class({
134134
var ty2 = xw * b + yh * d + f;
135135
var tx3 = xw * a + y * c + e;
136136
var ty3 = xw * b + y * d + f;
137-
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha);
137+
var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
138138

139139
vertexViewF32[vertexOffset + 0] = tx0;
140140
vertexViewF32[vertexOffset + 1] = ty0;
@@ -188,7 +188,7 @@ var FlatTintPipeline = new Class({
188188
var ty1 = x1 * b + y1 * d + f;
189189
var tx2 = x2 * a + y2 * c + e;
190190
var ty2 = x2 * b + y2 * d + f;
191-
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha);
191+
var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
192192

193193
vertexViewF32[vertexOffset + 0] = tx0;
194194
vertexViewF32[vertexOffset + 1] = ty0;
@@ -264,7 +264,7 @@ var FlatTintPipeline = new Class({
264264
var d = c1 * b0 + d1 * d0;
265265
var e = e1 * a0 + f1 * c0 + e0;
266266
var f = e1 * b0 + f1 * d0 + f0;
267-
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha);
267+
var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
268268

269269
for (var pathIndex = 0; pathIndex < length; ++pathIndex)
270270
{
@@ -330,7 +330,7 @@ var FlatTintPipeline = new Class({
330330
var vertexViewU32 = this.vertexViewU32;
331331
var vertexOffset;
332332
var line;
333-
var getTint = Utils.getTintAppendFloatAlpha;
333+
var getTint = Utils.getTintAppendFloatAlphaAndSwap;
334334

335335
for (var pathIndex = 0; pathIndex + 1 < pathLength; pathIndex += 1)
336336
{
@@ -434,7 +434,7 @@ var FlatTintPipeline = new Class({
434434
var y2 = lx2 * b + ly2 * d + f;
435435
var x3 = lx3 * a + ly3 * c + e;
436436
var y3 = lx3 * b + ly3 * d + f;
437-
var getTint = Utils.getTintAppendFloatAlpha;
437+
var getTint = Utils.getTintAppendFloatAlphaAndSwap;
438438
var aTint = getTint(aLineColor, lineAlpha);
439439
var bTint = getTint(bLineColor, lineAlpha);
440440
var vertexOffset = this.vertexCount * this.vertexComponentCount;

0 commit comments

Comments
 (0)