Skip to content

Commit

Permalink
Run Prettier on all files
Browse files Browse the repository at this point in the history
  • Loading branch information
akx committed Mar 5, 2021
1 parent 4ac0ef1 commit db14c64
Show file tree
Hide file tree
Showing 33 changed files with 204 additions and 156 deletions.
15 changes: 7 additions & 8 deletions benchmark/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>culori browser playground</title>
<script type="text/javascript" src='../build/culori.umd.js'></script>
</head>
<body>
</body>
</html>
<head>
<meta charset="utf-8" />
<title>culori browser playground</title>
<script type="text/javascript" src="../build/culori.umd.js"></script>
</head>
<body></body>
</html>
4 changes: 2 additions & 2 deletions benchmark/util/benchmark.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ function endBench() {
return end[0] + 's ' + end[1] / 1000000 + 'ms';
}

module.exports = function(name, fn) {
module.exports = function (name, fn) {
startBench();
fn();
console.log(name, endBench());
}
};
8 changes: 2 additions & 6 deletions src/cubehelix/constants.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
export const M = [
-0.14861, 1.78277,
-0.29227, -0.90649,
1.97294, 0
];
export const M = [-0.14861, 1.78277, -0.29227, -0.90649, 1.97294, 0];

export const degToRad = Math.PI / 180;
export const radToDeg = 180 / Math.PI;
export const radToDeg = 180 / Math.PI;
4 changes: 2 additions & 2 deletions src/cubehelix/convertCubehelixToRgb.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default ({ h, s, l, alpha }) => {
let res = { mode: 'rgb' };

h = (h === undefined ? 0 : h + 120) * degToRad;

let amp = s === undefined ? 0 : s * l * (1 - l);

let cosh = Math.cos(h);
Expand All @@ -16,4 +16,4 @@ export default ({ h, s, l, alpha }) => {

if (alpha !== undefined) res.alpha = alpha;
return res;
};
};
4 changes: 2 additions & 2 deletions src/dlch/constants.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export const kE = 1;
export const kCH = 1;
export const θ = 26 / 180 * Math.PI;
export const θ = (26 / 180) * Math.PI;
export const cosθ = Math.cos(θ);
export const sinθ = Math.sin(θ);
export const factor = 100/Math.log(139/100); // ~ 303.67
export const factor = 100 / Math.log(139 / 100); // ~ 303.67
6 changes: 3 additions & 3 deletions src/dlch/convertDlabToDlch.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ export default ({ l, a, b, alpha }) => {
mode: 'dlch',
l: l,
c: c
}
if (c) res.h = normalizeHue(Math.atan2(b, a) * 180 / Math.PI);
};
if (c) res.h = normalizeHue((Math.atan2(b, a) * 180) / Math.PI);
if (alpha !== undefined) res.alpha = alpha;
return res;
};
};
6 changes: 3 additions & 3 deletions src/dlch/convertDlchToDlab.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ export default ({ l, c, h, alpha }) => {
let res = {
mode: 'dlab',
l: l,
a: c === 0 ? 0 : c * Math.cos(h / 180 * Math.PI),
b: c === 0 ? 0 : c * Math.sin(h / 180 * Math.PI)
a: c === 0 ? 0 : c * Math.cos((h / 180) * Math.PI),
b: c === 0 ? 0 : c * Math.sin((h / 180) * Math.PI)
};
if (alpha !== undefined) res.alpha = alpha;
return res;
};
};
46 changes: 23 additions & 23 deletions src/hsi/convertHsiToRgb.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,49 @@ import normalizeHue from '../util/normalizeHue';

export default function ({ h, s, i, alpha }) {
h = normalizeHue(h);
let f = Math.abs(h/60 % 2 - 1);
let f = Math.abs(((h / 60) % 2) - 1);
let res;
switch (Math.floor(h/60)) {
case 0:
switch (Math.floor(h / 60)) {
case 0:
res = {
r: i * (1 + s * (3 / (2 - f) - 1)),
g: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)),
r: i * (1 + s * (3 / (2 - f) - 1)),
g: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)),
b: i * (1 - s)
};
break;
case 1:
case 1:
res = {
r: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)),
g: i * (1 + s * (3 / (2 - f) - 1)),
r: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)),
g: i * (1 + s * (3 / (2 - f) - 1)),
b: i * (1 - s)
};
break;
case 2:
case 2:
res = {
r: i * (1 - s),
g: i * (1 + s * (3 / (2 - f) - 1)),
b: i * (1 + s * (3 * (1 - f) / (2 - f) - 1))
r: i * (1 - s),
g: i * (1 + s * (3 / (2 - f) - 1)),
b: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1))
};
break;
case 3:
case 3:
res = {
r: i * (1 - s),
g: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)),
r: i * (1 - s),
g: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)),
b: i * (1 + s * (3 / (2 - f) - 1))
};
break;
case 4:
case 4:
res = {
r: i * (1 + s * (3 * (1 - f) / (2 - f) - 1)),
g: i * (1 - s),
r: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1)),
g: i * (1 - s),
b: i * (1 + s * (3 / (2 - f) - 1))
};
break;
case 5:
case 5:
res = {
r: i * (1 + s * (3 / (2 - f) - 1)),
g: i * (1 - s),
b: i * (1 + s * (3 * (1 - f) / (2 - f) - 1))
r: i * (1 + s * (3 / (2 - f) - 1)),
g: i * (1 - s),
b: i * (1 + s * ((3 * (1 - f)) / (2 - f) - 1))
};
break;
default:
Expand All @@ -56,4 +56,4 @@ export default function ({ h, s, i, alpha }) {
res.mode = 'rgb';
if (alpha !== undefined) res.alpha = alpha;
return res;
}
}
17 changes: 12 additions & 5 deletions src/hsi/convertRgbToHsi.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
// Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation

export default function({ r, g, b, alpha }) {
let M = Math.max(r, g, b), m = Math.min(r, g, b);
export default function ({ r, g, b, alpha }) {
let M = Math.max(r, g, b),
m = Math.min(r, g, b);
let res = {
mode: 'hsi',
s: r + g + b === 0 ? 0 : 1 - 3 * m / (r + g + b),
s: r + g + b === 0 ? 0 : 1 - (3 * m) / (r + g + b),
i: (r + g + b) / 3
};
if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60;
if (M - m !== 0)
res.h =
(M === r
? (g - b) / (M - m) + (g < b) * 6
: M === g
? (b - r) / (M - m) + 2
: (r - g) / (M - m) + 4) * 60;
if (alpha !== undefined) res.alpha = alpha;
return res;
}
}
35 changes: 24 additions & 11 deletions src/hsl/convertHslToRgb.js
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
import normalizeHue from '../util/normalizeHue';
// Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Converting_to_RGB

export default function({ h, s, l, alpha }) {
export default function ({ h, s, l, alpha }) {
h = normalizeHue(h);
let m1 = l + s * (l < 0.5 ? l : 1 - l);
let m2 = m1 - (m1 - l) * 2 * Math.abs(h/60 % 2 - 1);
let m2 = m1 - (m1 - l) * 2 * Math.abs(((h / 60) % 2) - 1);
let res;
switch (Math.floor(h/60)) {
case 0: res = { r: m1, g: m2, b: 2 * l - m1 }; break;
case 1: res = { r: m2, g: m1, b: 2 * l - m1 }; break;
case 2: res = { r: 2 * l - m1, g: m1, b: m2 }; break;
case 3: res = { r: 2 * l - m1, g: m2, b: m1 }; break;
case 4: res = { r: m2, g: 2 * l - m1, b: m1 }; break;
case 5: res = { r: m1, g: 2 * l - m1, b: m2 }; break;
default: res = { r: 2 * l - m1, g: 2 * l - m1, b: 2 * l - m1 };
switch (Math.floor(h / 60)) {
case 0:
res = { r: m1, g: m2, b: 2 * l - m1 };
break;
case 1:
res = { r: m2, g: m1, b: 2 * l - m1 };
break;
case 2:
res = { r: 2 * l - m1, g: m1, b: m2 };
break;
case 3:
res = { r: 2 * l - m1, g: m2, b: m1 };
break;
case 4:
res = { r: m2, g: 2 * l - m1, b: m1 };
break;
case 5:
res = { r: m1, g: 2 * l - m1, b: m2 };
break;
default:
res = { r: 2 * l - m1, g: 2 * l - m1, b: 2 * l - m1 };
}
res.mode = 'rgb';
if (alpha !== undefined) res.alpha = alpha;
return res;
};
}
15 changes: 11 additions & 4 deletions src/hsl/convertRgbToHsl.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
// Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation

export default function({ r, g, b, alpha }) {
let M = Math.max(r, g, b), m = Math.min(r, g, b);
export default function ({ r, g, b, alpha }) {
let M = Math.max(r, g, b),
m = Math.min(r, g, b);
let res = {
mode: 'hsl',
s: M === m ? 0 : (M - m) / (1 - Math.abs(M + m - 1)),
l: 0.5 * (M + m)
};
if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60;
if (M - m !== 0)
res.h =
(M === r
? (g - b) / (M - m) + (g < b) * 6
: M === g
? (b - r) / (M - m) + 2
: (r - g) / (M - m) + 4) * 60;
if (alpha !== undefined) res.alpha = alpha;
return res;
}
}
2 changes: 1 addition & 1 deletion src/hsl/parseHsl.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ export default color => {
res.alpha = match[7] / 255;
}
return res;
}
};
35 changes: 24 additions & 11 deletions src/hsv/convertHsvToRgb.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,33 @@ import normalizeHue from '../util/normalizeHue';

// Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Converting_to_RGB

export default function({ h, s, v, alpha }) {
export default function ({ h, s, v, alpha }) {
h = normalizeHue(h);
let f = Math.abs(h/60 % 2 - 1);
let f = Math.abs(((h / 60) % 2) - 1);
let res;
switch (Math.floor(h/60)) {
case 0: res = { r: v, g: v * (1 - s * f), b: v * (1 - s) }; break;
case 1: res = { r: v * (1 - s * f), g: v, b: v * (1 - s) }; break;
case 2: res = { r: v * (1 - s), g: v, b: v * (1 - s * f) }; break;
case 3: res = { r: v * (1 - s), g: v * (1 - s * f), b: v }; break;
case 4: res = { r: v * (1 - s * f), g: v * (1 - s), b: v }; break;
case 5: res = { r: v, g: v * (1 - s), b: v * (1 - s * f) }; break;
default: res = { r: v * (1 - s), g: v * (1 - s), b: v * (1 - s) };
switch (Math.floor(h / 60)) {
case 0:
res = { r: v, g: v * (1 - s * f), b: v * (1 - s) };
break;
case 1:
res = { r: v * (1 - s * f), g: v, b: v * (1 - s) };
break;
case 2:
res = { r: v * (1 - s), g: v, b: v * (1 - s * f) };
break;
case 3:
res = { r: v * (1 - s), g: v * (1 - s * f), b: v };
break;
case 4:
res = { r: v * (1 - s * f), g: v * (1 - s), b: v };
break;
case 5:
res = { r: v, g: v * (1 - s), b: v * (1 - s * f) };
break;
default:
res = { r: v * (1 - s), g: v * (1 - s), b: v * (1 - s) };
}
res.mode = 'rgb';
if (alpha !== undefined) res.alpha = alpha;
return res;
};
}
15 changes: 11 additions & 4 deletions src/hsv/convertRgbToHsv.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
// Based on: https://en.wikipedia.org/wiki/HSL_and_HSV#Formal_derivation

export default function({ r, g, b, alpha }) {
let M = Math.max(r, g, b), m = Math.min(r, g, b);
export default function ({ r, g, b, alpha }) {
let M = Math.max(r, g, b),
m = Math.min(r, g, b);
let res = {
mode: 'hsv',
s: M === 0 ? 0 : 1 - m / M,
v: M
};
if (M - m !== 0) res.h = (M === r ? (g - b) / (M - m) + (g < b) * 6 : M === g ? (b - r) / (M - m) + 2 : (r - g) / (M - m) + 4) * 60;
if (M - m !== 0)
res.h =
(M === r
? (g - b) / (M - m) + (g < b) * 6
: M === g
? (b - r) / (M - m) + 2
: (r - g) / (M - m) + 4) * 60;
if (alpha !== undefined) res.alpha = alpha;
return res;
}
}
12 changes: 6 additions & 6 deletions src/hwb/convertHwbToRgb.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ export default function ({ h, w, b, alpha }) {
// normalize w + b to 1
if (w + b > 1) {
let s = w + b;
w /= s;
w /= s;
b /= s;
}
return convertHsvToRgb({
h: h,
s: b === 1 ? 1 : 1 - w / (1 - b),
return convertHsvToRgb({
h: h,
s: b === 1 ? 1 : 1 - w / (1 - b),
v: 1 - b,
alpha: alpha
});
};
});
}
2 changes: 1 addition & 1 deletion src/hwb/convertRgbToHwb.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import convertRgbToHsv from '../hsv/convertRgbToHsv';

export default function(rgba) {
export default function (rgba) {
let hsv = convertRgbToHsv(rgba);
if (hsv === undefined) return undefined;
let res = {
Expand Down
Loading

0 comments on commit db14c64

Please sign in to comment.