asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #77863 from dinoplane/alien-color-changes

Browse source 
Use cached hue for color picker when saturation is 0
This commit is contained in:
Rémi Verschelde 2023-06-12 11:39:31 +02:00
commit bcbc2fb087
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scene/gui/color_mode.cpp
View file

@ -117,8 +117,13 @@ float ColorModeHSV::get_slider_max(int idx) const {
float ColorModeHSV::get_slider_value(int idx) const { float ColorModeHSV::get_slider_value(int idx) const {
switch (idx) { switch (idx) {
case 0: case 0: {
return color_picker->get_pick_color().get_h() * 360.0; if (color_picker->get_pick_color().get_s() > 0) {
return color_picker->get_pick_color().get_h() * 360.0;
} else {
return color_picker->get_cached_hue();
}
}
case 1: case 1:
return color_picker->get_pick_color().get_s() * 100.0; return color_picker->get_pick_color().get_s() * 100.0;
case 2: case 2:
@ -165,7 +170,9 @@ void ColorModeHSV::slider_draw(int p_which) {
Color v_col; Color v_col;
s_col.set_hsv(color.get_h(), 0, color.get_v()); s_col.set_hsv(color.get_h(), 0, color.get_v());
left_color = (p_which == 1) ? s_col : Color(0, 0, 0); left_color = (p_which == 1) ? s_col : Color(0, 0, 0);
s_col.set_hsv(color.get_h(), 1, color.get_v());
float s_col_hue = (color.get_s() == 0.0) ? color_picker->get_cached_hue() / 360.0 : color.get_h();
s_col.set_hsv(s_col_hue, 1, color.get_v());
v_col.set_hsv(color.get_h(), color.get_s(), 1); v_col.set_hsv(color.get_h(), color.get_s(), 1);
right_color = (p_which == 1) ? s_col : v_col; right_color = (p_which == 1) ? s_col : v_col;
} }

6
scene/gui/color_picker.cpp
View file

@ -376,6 +376,12 @@ void ColorPicker::_value_changed(double) {
color = modes[current_mode]->get_color(); color = modes[current_mode]->get_color();
if (current_mode == MODE_HSV) {
if (sliders[1]->get_value() > 0 || sliders[0]->get_value() != cached_hue) {
cached_hue = sliders[0]->get_value();
}
}
if (current_mode == MODE_HSV || current_mode == MODE_OKHSL) { if (current_mode == MODE_HSV || current_mode == MODE_OKHSL) {
h = sliders[0]->get_value() / 360.0; h = sliders[0]->get_value() / 360.0;
s = sliders[1]->get_value() / 100.0; s = sliders[1]->get_value() / 100.0;

2
scene/gui/color_picker.h
View file

@ -204,6 +204,7 @@ private:
float h = 0.0; float h = 0.0;
float s = 0.0; float s = 0.0;
float v = 0.0; float v = 0.0;
float cached_hue = 0.0;
Color last_color; Color last_color;
struct ThemeCache { struct ThemeCache {
@ -294,6 +295,7 @@ public:
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
void set_editor_settings(Object *p_editor_settings); void set_editor_settings(Object *p_editor_settings);
#endif #endif
float get_cached_hue() { return cached_hue; };
HSlider *get_slider(int idx); HSlider *get_slider(int idx);
Vector<float> get_active_slider_values(); Vector<float> get_active_slider_values();