RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

LibGfx: Always use 0..360 0..1 0..1 in HSV colors

Browse source
This commit is contained in:
LepkoQQ 2020-08-25 16:28:36 +02:00 • committed by Andreas Kling
parent 0604f82a96
commit 7a46e0fa35
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibGfx/Color.h
View file

@ -26,6 +26,7 @@
#pragma once #pragma once
#include <AK/Assertions.h>
#include <AK/Forward.h> #include <AK/Forward.h>
#include <AK/StdLibExtras.h> #include <AK/StdLibExtras.h>
#include <LibIPC/Forward.h> #include <LibIPC/Forward.h>
@ -196,14 +197,17 @@ public:
if (hsv.hue >= 360.0) if (hsv.hue >= 360.0)
hsv.hue -= 360.0; hsv.hue -= 360.0;
hsv.hue /= 360.0;
if (!max) if (!max)
hsv.saturation = 0; hsv.saturation = 0;
else else
hsv.saturation = chroma / max; hsv.saturation = chroma / max;
hsv.value = max; hsv.value = max;
ASSERT(hsv.hue >= 0.0 && hsv.hue < 360.0);
ASSERT(hsv.saturation >= 0.0 && hsv.saturation <= 1.0);
ASSERT(hsv.value >= 0.0 && hsv.value <= 1.0);
return hsv; return hsv;
} }
@ -214,9 +218,13 @@ public:
static Color from_hsv(const HSV& hsv) static Color from_hsv(const HSV& hsv)
{ {
double hue = hsv.hue * 2.0; ASSERT(hsv.hue >= 0.0 && hsv.hue < 360.0);
double saturation = hsv.saturation / 255.0; ASSERT(hsv.saturation >= 0.0 && hsv.saturation <= 1.0);
double value = hsv.value / 255.0; ASSERT(hsv.value >= 0.0 && hsv.value <= 1.0);
double hue = hsv.hue;
double saturation = hsv.saturation;
double value = hsv.value;
int high = static_cast<int>(hue / 60.0) % 6; int high = static_cast<int>(hue / 60.0) % 6;
double f = (hue / 60.0) - high; double f = (hue / 60.0) - high;