mirror/pixel-editor
1
0
Fork 0
mirror of https://github.com/lospec/pixel-editor.git synced 2023-08-10 21:12:51 +03:00
Code Issues Projects Releases Wiki Activity

Fixed advanced colour picker bugs

Browse Source
This commit is contained in:
unsettledgames
2021-07-11 23:27:48 +02:00
parent ef2630b876
commit 6072528ad2
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/Color.js
View File

@ -48,25 +48,21 @@ class Color {
} : null;
}
static rgbToHex(rgb) {
//convert a decimal number to 2-digit hex
let hex = "";
Object.values(rgb).forEach((color) => {
let colorToString = color.toString(16);
if (colorToString.length === 1) {
colorToString = "0" + colorToString;
}
hex += colorToString;
});
return hex;
function componentToHex (c) {
var hex = Math.round(c).toString(16);
return hex.length == 1 ? "0" + hex : hex.substring(0, 2);
}
return componentToHex(rgb.r) + componentToHex(rgb.g) + componentToHex(rgb.b);
}
static hslToRgb(hsl) {
let r, g, b;
let h = hsl.h, s = hsl.s, l = hsl.l;
h /= 255;
s /= 255;
l /= 255;
h /= 360;
s /= 100;
l /= 100;
if(s == 0){
r = g = b = l; // achromatic
@ -116,7 +112,7 @@ class Color {
hue /= 6;
}
return {h:hue, s:saturation, l:luminosity};
return {h:hue*360, s:saturation*100, l:luminosity*100};
}
static hsvToRgb(hsv) {