scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compress HSL and HSB converters even more.

Browse source
This commit is contained in:
Jürg Lehni 2011-07-07 00:19:13 +02:00
parent adff506751
commit baf7136ef7
1 changed files with 9 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/color/Color.js
View file

@ -114,19 +114,12 @@ var Color = this.Color = Base.extend(new function() {
max = Math.max(r, g, b),
min = Math.min(r, g, b),
delta = max - min,
h,
h = delta == 0 ? 0
: ( max == r ? (g - b) / delta + (g < b ? 6 : 0)
: max == g ? (b - r) / delta + 2
: (r - g) / delta + 4) * 60, // max == b
s = max == 0 ? 0 : delta / max,
v = max; // = brightness, also called value
if (delta == 0) {
h = 0; // Achromatic
} else {
switch (max) {
case r: h = (g - b) / delta + (g < b ? 6 : 0); break;
case g: h = (b - r) / delta + 2; break;
case b: h = (r - g) / delta + 4; break;
}
h *= 60;
}
return new HSBColor(h, s, v, color._alpha);
},
@ -155,23 +148,14 @@ var Color = this.Color = Base.extend(new function() {
max = Math.max(r, g, b),
min = Math.min(r, g, b),
delta = max - min,
h,
s,
l = (max + min) / 2;
if (delta == 0) {
h = s = 0;
} else {
h = delta == 0 ? 0
: ( max == r ? (g - b) / delta + (g < b ? 6 : 0)
: max == g ? (b - r) / delta + 2
: (r - g) / delta + 4) * 60, // max == b
l = (max + min) / 2,
s = l < 0.5
? delta / (max + min)
: delta / (2 - max - min);
}
switch (max) {
case r: h = (g - b) / delta; break;
case g: h = (b - r) / delta + 2; break;
case b: h = (r - g) / delta + 4; break;
}
h *= 60;
if (h < 0) h += 360;
return new HSLColor(h, s, l, color._alpha);
},