Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-23 13:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed tint issue

Browse source
This commit is contained in:
Felipe Alfonso 2018-01-26 00:55:05 -03:00
parent fe22495000
commit 9173ed88d9
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/renderer/webgl/Utils.js
View file

@ -7,10 +7,16 @@ module.exports = {
var ub = ((b * 255.0)|0) & 0xFF; var ub = ((b * 255.0)|0) & 0xFF;
var ua = ((a * 255.0)|0) & 0xFF; var ua = ((a * 255.0)|0) & 0xFF;
return ((ua << 24) | (ub << 16) | (ug << 8) | ur) >>> 0; return ((ua << 24) | (ur << 16) | (ug << 8) | ub) >>> 0;
}, },
getTintAppendFloatAlpha: function (rgb, a) getTintAppendFloatAlpha: function (rgb, a)
{
var ua = ((a * 255.0)|0) & 0xFF;
return ((ua << 24) | rgb) >>> 0;
},
getTintAppendFloatAlphaAndSwap: function (rgb, a)
{ {
var ur = ((rgb >> 16)|0) & 0xff; var ur = ((rgb >> 16)|0) & 0xff;
var ug = ((rgb >> 8)|0) & 0xff; var ug = ((rgb >> 8)|0) & 0xff;

10
src/renderer/webgl/pipelines/FlatTintPipeline.js
View file

@ -134,7 +134,7 @@ var FlatTintPipeline = new Class({
var ty2 = xw * b + yh * d + f; var ty2 = xw * b + yh * d + f;
var tx3 = xw * a + y * c + e; var tx3 = xw * a + y * c + e;
var ty3 = xw * b + y * d + f; var ty3 = xw * b + y * d + f;
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha); var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
vertexViewF32[vertexOffset + 0] = tx0; vertexViewF32[vertexOffset + 0] = tx0;
vertexViewF32[vertexOffset + 1] = ty0; vertexViewF32[vertexOffset + 1] = ty0;
@ -188,7 +188,7 @@ var FlatTintPipeline = new Class({
var ty1 = x1 * b + y1 * d + f; var ty1 = x1 * b + y1 * d + f;
var tx2 = x2 * a + y2 * c + e; var tx2 = x2 * a + y2 * c + e;
var ty2 = x2 * b + y2 * d + f; var ty2 = x2 * b + y2 * d + f;
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha); var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
vertexViewF32[vertexOffset + 0] = tx0; vertexViewF32[vertexOffset + 0] = tx0;
vertexViewF32[vertexOffset + 1] = ty0; vertexViewF32[vertexOffset + 1] = ty0;
@ -264,7 +264,7 @@ var FlatTintPipeline = new Class({
var d = c1 * b0 + d1 * d0; var d = c1 * b0 + d1 * d0;
var e = e1 * a0 + f1 * c0 + e0; var e = e1 * a0 + f1 * c0 + e0;
var f = e1 * b0 + f1 * d0 + f0; var f = e1 * b0 + f1 * d0 + f0;
var tint = Utils.getTintAppendFloatAlpha(fillColor, fillAlpha); var tint = Utils.getTintAppendFloatAlphaAndSwap(fillColor, fillAlpha);
for (var pathIndex = 0; pathIndex < length; ++pathIndex) for (var pathIndex = 0; pathIndex < length; ++pathIndex)
{ {
@ -330,7 +330,7 @@ var FlatTintPipeline = new Class({
var vertexViewU32 = this.vertexViewU32; var vertexViewU32 = this.vertexViewU32;
var vertexOffset; var vertexOffset;
var line; var line;
var getTint = Utils.getTintAppendFloatAlpha; var getTint = Utils.getTintAppendFloatAlphaAndSwap;
for (var pathIndex = 0; pathIndex + 1 < pathLength; pathIndex += 1) for (var pathIndex = 0; pathIndex + 1 < pathLength; pathIndex += 1)
{ {
@ -434,7 +434,7 @@ var FlatTintPipeline = new Class({
var y2 = lx2 * b + ly2 * d + f; var y2 = lx2 * b + ly2 * d + f;
var x3 = lx3 * a + ly3 * c + e; var x3 = lx3 * a + ly3 * c + e;
var y3 = lx3 * b + ly3 * d + f; var y3 = lx3 * b + ly3 * d + f;
var getTint = Utils.getTintAppendFloatAlpha; var getTint = Utils.getTintAppendFloatAlphaAndSwap;
var aTint = getTint(aLineColor, lineAlpha); var aTint = getTint(aLineColor, lineAlpha);
var bTint = getTint(bLineColor, lineAlpha); var bTint = getTint(bLineColor, lineAlpha);
var vertexOffset = this.vertexCount * this.vertexComponentCount; var vertexOffset = this.vertexCount * this.vertexComponentCount;