Skip to content

Commit 1ee3751

Browse files
committed
Included color in HSV output.
1 parent b8f0b33 commit 1ee3751

1 file changed

Lines changed: 20 additions & 6 deletions

File tree

v3/src/graphics/color/HSVToRGB.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var GetColor = require('./GetColor');
2+
13
/**
24
* Converts an HSV (hue, saturation and value) color value to RGB.
35
* Conversion formula from http://en.wikipedia.org/wiki/HSL_color_space.
@@ -22,34 +24,46 @@ var HSVToRGB = function (h, s, v)
2224
var q = Math.floor((v * (1 - f * s)) * 255);
2325
var t = Math.floor((v * (1 - (1 - f) * s)) * 255);
2426

27+
var output = { r: v, g: v, b: v, color: 0 };
28+
2529
v = Math.floor(v *= 255);
2630

2731
var r = i % 6;
2832

2933
if (r === 0)
3034
{
31-
return { r: v, g: t, b: p };
35+
output.g = t;
36+
output.b = p;
3237
}
3338
else if (r === 1)
3439
{
35-
return { r: q, g: v, b: p };
40+
output.r = q;
41+
output.b = p;
3642
}
3743
else if (r === 2)
3844
{
39-
return { r: p, g: v, b: t };
45+
output.r = p;
46+
output.b = t;
4047
}
4148
else if (r === 3)
4249
{
43-
return { r: p, g: q, b: v };
50+
output.r = p;
51+
output.g = q;
4452
}
4553
else if (r === 4)
4654
{
47-
return { r: t, g: p, b: v };
55+
output.r = t;
56+
output.g = p;
4857
}
4958
else if (r === 5)
5059
{
51-
return { r: v, g: p, b: q };
60+
output.g = p;
61+
output.b = q;
5262
}
63+
64+
output.color = GetColor(output.r, output.g, output.b);
65+
66+
return output;
5367
};
5468

5569
module.exports = HSVToRGB;

0 commit comments

Comments
 (0)