Skip to content

ColorPicker: Fix OKHSL circle in HSV mode #99461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2024
Merged

ColorPicker: Fix OKHSL circle in HSV mode #99461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions scene/gui/color_picker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@ void fragment() {
circle_ok_color_shader->set_code(OK_COLOR_SHADER + R"(
// ColorPicker ok color hsv circle shader.

uniform float v = 1.0;
uniform float ok_hsl_l = 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));
vec3 col = okhsl_to_srgb(vec3(h, s, ok_hsl_l));
x += 0.001;
y += 0.001;
float b = float(sqrt(x * x + y * y) < 0.5);
Expand Down Expand Up @@ -387,10 +387,21 @@ void ColorPicker::_slider_value_changed() {
color = modes[current_mode]->get_color();
modes[current_mode]->_value_changed();

if (current_mode == MODE_HSV || current_mode == MODE_OKHSL) {
if (current_mode == MODE_HSV) {
h = sliders[0]->get_value() / 360.0;
s = sliders[1]->get_value() / 100.0;
v = sliders[2]->get_value() / 100.0;
ok_hsl_h = color.get_ok_hsl_h();
ok_hsl_s = color.get_ok_hsl_s();
ok_hsl_l = color.get_ok_hsl_l();
last_color = color;
} else if (current_mode == MODE_OKHSL) {
ok_hsl_h = sliders[0]->get_value() / 360.0;
ok_hsl_s = sliders[1]->get_value() / 100.0;
ok_hsl_l = sliders[2]->get_value() / 100.0;
h = color.get_h();
s = color.get_s();
v = color.get_v();
last_color = color;
}

Expand Down Expand Up @@ -504,20 +515,17 @@ Vector<float> ColorPicker::get_active_slider_values() {
}

void ColorPicker::_copy_color_to_hsv() {
if (_get_actual_shape() == SHAPE_OKHSL_CIRCLE) {
h = color.get_ok_hsl_h();
s = color.get_ok_hsl_s();
v = color.get_ok_hsl_l();
} else {
h = color.get_h();
s = color.get_s();
v = color.get_v();
}
ok_hsl_h = color.get_ok_hsl_h();
ok_hsl_s = color.get_ok_hsl_s();
ok_hsl_l = color.get_ok_hsl_l();
h = color.get_h();
s = color.get_s();
v = color.get_v();
}

void ColorPicker::_copy_hsv_to_color() {
if (_get_actual_shape() == SHAPE_OKHSL_CIRCLE) {
color.set_ok_hsl(h, s, v, color.a);
color.set_ok_hsl(ok_hsl_h, ok_hsl_s, ok_hsl_l, color.a);
} else {
color.set_hsv(h, s, v, color.a);
}
Expand Down Expand Up @@ -1201,8 +1209,8 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
int x;
int y;
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
x = center.x + (center.x * Math::cos(h * Math_TAU) * s) - (theme_cache.picker_cursor->get_width() / 2);
y = center.y + (center.y * Math::sin(h * Math_TAU) * s) - (theme_cache.picker_cursor->get_height() / 2);
x = center.x + (center.x * Math::cos((actual_shape == SHAPE_OKHSL_CIRCLE ? ok_hsl_h : h) * Math_TAU) * s) - (theme_cache.picker_cursor->get_width() / 2);
y = center.y + (center.y * Math::sin((actual_shape == SHAPE_OKHSL_CIRCLE ? ok_hsl_h : h) * Math_TAU) * s) - (theme_cache.picker_cursor->get_height() / 2);
} else {
real_t corner_x = (c == wheel_uv) ? center.x - Math_SQRT12 * c->get_size().width * 0.42 : 0;
real_t corner_y = (c == wheel_uv) ? center.y - Math_SQRT12 * c->get_size().height * 0.42 : 0;
Expand Down Expand Up @@ -1238,11 +1246,11 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
Vector<Point2> points;
Vector<Color> colors;
Color col;
col.set_ok_hsl(h, s, 1);
col.set_ok_hsl(ok_hsl_h, ok_hsl_s, 1);
Color col2;
col2.set_ok_hsl(h, s, 0.5);
col2.set_ok_hsl(ok_hsl_h, ok_hsl_s, 0.5);
Color col3;
col3.set_ok_hsl(h, s, 0);
col3.set_ok_hsl(ok_hsl_h, ok_hsl_s, 0);
points.resize(6);
colors.resize(6);
points.set(0, Vector2(c->get_size().x, 0));
Expand All @@ -1258,8 +1266,8 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
colors.set(4, col2);
colors.set(5, col);
c->draw_polygon(points, colors);
int y = c->get_size().y - c->get_size().y * CLAMP(v, 0, 1);
col.set_ok_hsl(h, 1, v);
int y = c->get_size().y - c->get_size().y * CLAMP(ok_hsl_l, 0, 1);
col.set_ok_hsl(ok_hsl_h, 1, ok_hsl_l);
c->draw_line(Point2(0, y), Point2(c->get_size().x, y), col.inverted());
} else if (actual_shape == SHAPE_VHS_CIRCLE) {
Vector<Point2> points;
Expand All @@ -1283,8 +1291,10 @@ void ColorPicker::_hsv_draw(int p_which, Control *c) {
}
} else if (p_which == 2) {
c->draw_rect(Rect2(Point2(), c->get_size()), Color(1, 1, 1));
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
if (actual_shape == SHAPE_VHS_CIRCLE) {
circle_mat->set_shader_parameter("v", v);
} else if (actual_shape == SHAPE_OKHSL_CIRCLE) {
circle_mat->set_shader_parameter("ok_hsl_l", ok_hsl_l);
}
}
}
Expand All @@ -1308,6 +1318,8 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
real_t rad = center.angle_to_point(bev->get_position());
h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
s = CLAMP(dist / center.x, 0, 1);
ok_hsl_h = h;
ok_hsl_s = s;
} else {
return;
}
Expand Down Expand Up @@ -1375,6 +1387,8 @@ void ColorPicker::_uv_input(const Ref<InputEvent> &p_event, Control *c) {
real_t rad = center.angle_to_point(mev->get_position());
h = ((rad >= 0) ? rad : (Math_TAU + rad)) / Math_TAU;
s = CLAMP(dist / center.x, 0, 1);
ok_hsl_h = h;
ok_hsl_s = s;
} else {
if (spinning) {
real_t rad = center.angle_to_point(mev->get_position());
Expand Down Expand Up @@ -1412,6 +1426,7 @@ void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
float y = CLAMP((float)bev->get_position().y, 0, w_edit->get_size().height);
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
v = 1.0 - (y / w_edit->get_size().height);
ok_hsl_l = v;
} else {
h = y / w_edit->get_size().height;
}
Expand Down Expand Up @@ -1440,6 +1455,7 @@ void ColorPicker::_w_input(const Ref<InputEvent> &p_event) {
float y = CLAMP((float)mev->get_position().y, 0, w_edit->get_size().height);
if (actual_shape == SHAPE_VHS_CIRCLE || actual_shape == SHAPE_OKHSL_CIRCLE) {
v = 1.0 - (y / w_edit->get_size().height);
ok_hsl_l = v;
} else {
h = y / w_edit->get_size().height;
}
Expand Down
5 changes: 5 additions & 0 deletions scene/gui/color_picker.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ class ColorPicker : public VBoxContainer {
float h = 0.0;
float s = 0.0;
float v = 0.0;

float ok_hsl_h = 0.0;
float ok_hsl_s = 0.0;
float ok_hsl_l = 0.0;

Color last_color;

struct ThemeCache {
Expand Down