summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2022-08-01 12:39:55 -0700
committerK. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>2022-08-01 13:20:11 -0700
commit8b64e331c3b83b9d8995bc9a0d3264c47e3de3b5 (patch)
tree82089ddb49acd189b4321b069da09727284b6af2 /scene/gui
parent9ec6de1767292b5cbc1ebdc7b262ef1d9c63df9a (diff)
Mend the non-matching okhsl colors.
Closer match.
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/color_picker.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp
index e2ead6415a..dc186b2209 100644
--- a/scene/gui/color_picker.cpp
+++ b/scene/gui/color_picker.cpp
@@ -171,6 +171,9 @@ uniform float v = 1.0;
void fragment() {
float x = UV.x - 0.5;
float y = UV.y - 0.5;
+ float h = atan(y, x) / (2.0 * M_PI);
+ float s = sqrt(x * x + y * y) * 2.0;
+ vec3 col = okhsl_to_srgb(vec3(h, s, v));
x += 0.001;
y += 0.001;
float b = float(sqrt(x * x + y * y) < 0.5);
@@ -180,9 +183,6 @@ void fragment() {
float b3 = float(sqrt(x * x + y * y) < 0.5);
x += 0.002;
float b4 = float(sqrt(x * x + y * y) < 0.5);
- float s = sqrt(x * x + y * y);
- float h = atan(y, x) / (2.0*M_PI);
- vec3 col = okhsl_to_srgb(vec3(h, s, v));
COLOR = vec4(col, (b + b2 + b3 + b4) / 4.00);
})");
}