mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-21 10:19:03 +03:00
LibGfx: Always use 0..360 0..1 0..1 in HSV colors
This commit is contained in:
parent
0604f82a96
commit
7a46e0fa35
Notes:
sideshowbarker
2024-07-19 03:10:08 +09:00
Author: https://github.com/LepkoQQ Commit: https://github.com/SerenityOS/serenity/commit/7a46e0fa351 Pull-request: https://github.com/SerenityOS/serenity/pull/3301
@ -26,6 +26,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Assertions.h>
|
||||
#include <AK/Forward.h>
|
||||
#include <AK/StdLibExtras.h>
|
||||
#include <LibIPC/Forward.h>
|
||||
@ -196,14 +197,17 @@ public:
|
||||
if (hsv.hue >= 360.0)
|
||||
hsv.hue -= 360.0;
|
||||
|
||||
hsv.hue /= 360.0;
|
||||
|
||||
if (!max)
|
||||
hsv.saturation = 0;
|
||||
else
|
||||
hsv.saturation = chroma / 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;
|
||||
}
|
||||
|
||||
@ -214,9 +218,13 @@ public:
|
||||
|
||||
static Color from_hsv(const HSV& hsv)
|
||||
{
|
||||
double hue = hsv.hue * 2.0;
|
||||
double saturation = hsv.saturation / 255.0;
|
||||
double value = hsv.value / 255.0;
|
||||
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);
|
||||
|
||||
double hue = hsv.hue;
|
||||
double saturation = hsv.saturation;
|
||||
double value = hsv.value;
|
||||
|
||||
int high = static_cast<int>(hue / 60.0) % 6;
|
||||
double f = (hue / 60.0) - high;
|
||||
|
Loading…
Reference in New Issue
Block a user