Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-11-16 09:48:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1728 from cuixiping/dev

Browse source 
Fix bug of Color.webToColor and Color.updateColor
This commit is contained in:
Richard Davey 2015-04-13 11:23:44 +01:00
commit daea4e8087
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/utils/Color.js
View file

@ -441,9 +441,6 @@ Phaser.Color = {
var out = { r: r || 0, g: g || 0, b: b || 0, a: a || 1, h: h || 0, s: s || 0, l: l || 0, v: v || 0, color: 0, color32: 0, rgba: '' }; var out = { r: r || 0, g: g || 0, b: b || 0, a: a || 1, h: h || 0, s: s || 0, l: l || 0, v: v || 0, color: 0, color32: 0, rgba: '' };
out.color = Phaser.Color.getColor(out.r, out.g, out.b);
out.color32 = Phaser.Color.getColor32(out.a, out.r, out.g, out.b);
return Phaser.Color.updateColor(out); return Phaser.Color.updateColor(out);
}, },
@ -459,6 +456,8 @@ Phaser.Color = {
updateColor: function (out) { updateColor: function (out) {
out.rgba = 'rgba(' + out.r.toString() + ',' + out.g.toString() + ',' + out.b.toString() + ',' + out.a.toString() + ')'; out.rgba = 'rgba(' + out.r.toString() + ',' + out.g.toString() + ',' + out.b.toString() + ',' + out.a.toString() + ')';
out.color = Phaser.Color.getColor(out.r, out.g, out.b);
out.color32 = Phaser.Color.getColor32(out.a, out.r, out.g, out.b);
return out; return out;
@ -615,6 +614,7 @@ Phaser.Color = {
out.g = parseInt(result[2], 10); out.g = parseInt(result[2], 10);
out.b = parseInt(result[3], 10); out.b = parseInt(result[3], 10);
out.a = result[4] !== undefined ? parseFloat(result[4]) : 1; out.a = result[4] !== undefined ? parseFloat(result[4]) : 1;
Phaser.Color.updateColor(out);
} }
return out; return out;