X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fgame%2Flevel%2Flevel_editor%2Fcolor_picker.c;h=d4bae4a4e20cbedb03a8aeb49bf40e8cf38bbc75;hb=abc356a119cfdffbc8e7467faeead39824902018;hp=2701121959bc0a00e4e07330669c30a261bdea12;hpb=1077089ddc52277c50d2674d8d17fe3517a7edc4;p=nothing.git

diff --git a/src/game/level/level_editor/color_picker.c b/src/game/level/level_editor/color_picker.c
index 27011219..d4bae4a4 100644
--- a/src/game/level/level_editor/color_picker.c
+++ b/src/game/level/level_editor/color_picker.c
@@ -2,75 +2,130 @@
 
 #include "game/level/boxes.h"
 #include "system/stacktrace.h"
+#include "system/line_stream.h"
+#include "system/log.h"
 #include "game/camera.h"
 #include "proto_rect.h"
 #include "color_picker.h"
 #include "color.h"
 
-#define COLOR_CELL_WIDTH 50.0f
-#define COLOR_CELL_HEIGHT 50.0f
+#define COLOR_SLIDER_HEIGHT 50.0f
+#define COLOR_SLIDER_WIDTH 300.0f
 
-// TODO(#788): Colors of ColorPicker are poor
-static Color colors[] = {
-    {1.0f, 0.0f, 0.0f, 1.0f},
-    {0.0f, 1.0f, 0.0f, 1.0f},
-    {0.0f, 0.0f, 1.0f, 1.0f}
+const char *slider_labels[COLOR_SLIDER_N] = {
+    "Hue",
+    "Saturation",
+    "Lightness"
 };
-static const size_t colors_count = sizeof(colors) / sizeof(Color);
 
+LayerPtr color_picker_as_layer(ColorPicker *color_picker)
+{
+    LayerPtr layer = {
+        .ptr = color_picker,
+        .type = LAYER_COLOR_PICKER
+    };
+    return layer;
+}
+
+ColorPicker create_color_picker_from_rgba(Color color)
+{
+    Color color_hsla = rgba_to_hsla(color);
+    ColorPicker color_picker = {
+        .sliders = {
+            {0, color_hsla.r, 360.0f},
+            {0, color_hsla.g, 1.0f},
+            {0, color_hsla.b, 1.0f}
+        }
+    };
+    return color_picker;
+}
+
+int color_picker_read_from_line_stream(ColorPicker *color_picker,
+                                       LineStream *line_stream)
+{
+    char color[7];
+    const char *line = line_stream_next(line_stream);
+    if (line == NULL) {
+        return -1;
+    }
+
+    if (sscanf(line, "%6s", color) == EOF) {
+        log_fail("Could not read color\n");
+    }
+
+    *color_picker = create_color_picker_from_rgba(hexstr(color));
+
+    return 0;
+}
+
+// TODO(#930): Color Picker doesn't have any visual indication about the current color
 int color_picker_render(const ColorPicker *color_picker,
                         Camera *camera)
 {
     trace_assert(color_picker);
     trace_assert(camera);
 
-    for (size_t i = 0; i < colors_count; ++i) {
-        if (camera_fill_rect_screen(
+    /* TODO(#931): Color Picker sliders don't have any labels */
+    for (ColorPickerSlider index = 0; index < COLOR_SLIDER_N; ++index) {
+        const Rect slider_rect =
+            rect(0.0f, COLOR_SLIDER_HEIGHT * (float) (index + 1),
+                 COLOR_SLIDER_WIDTH, COLOR_SLIDER_HEIGHT);
+        const Point label_size = vec(2.5f, 2.5f);
+
+        if (slider_render(
+                &color_picker->sliders[index],
                 camera,
-                rect(COLOR_CELL_WIDTH * (float) i, 0,
-                     COLOR_CELL_WIDTH,
-                     COLOR_CELL_HEIGHT),
-                colors[i]) < 0) {
+                slider_rect) < 0) {
             return -1;
         }
-    }
 
-    return 0;
-}
+        if (camera_render_text_screen(
+                camera,
+                slider_labels[index],
+                label_size,
+                COLOR_BLACK,
+                vec(slider_rect.x + COLOR_SLIDER_WIDTH,
+                    slider_rect.y + COLOR_SLIDER_HEIGHT * 0.5f - label_size.y * (float) FONT_CHAR_HEIGHT * 0.5f)) < 0) {
+            return -1;
+        }
+    }
 
-int color_picker_update(ColorPicker *color_picker,
-                        float delta_time)
-{
-    trace_assert(color_picker);
-    (void) delta_time;
     return 0;
 }
 
-int color_picker_event(ColorPicker *color_picker,
-                       const SDL_Event *event)
+// TODO(#932): the `selected` event propagation control is cumbersome
+int color_picker_event(ColorPicker *color_picker, const SDL_Event *event, int *selected_out)
 {
     trace_assert(color_picker);
     trace_assert(event);
 
-    switch (event->type) {
-    case SDL_MOUSEBUTTONDOWN: {
-        switch (event->button.button) {
-        case SDL_BUTTON_LEFT: {
-            for (size_t i = 0; i < colors_count; ++i) {
-                const Vec mouse_position = vec((float) event->button.x, (float) event->button.y);
-                const Rect color_cell =
-                    rect(COLOR_CELL_WIDTH * (float) i, 0,
-                         COLOR_CELL_WIDTH,
-                         COLOR_CELL_HEIGHT);
-                if (rect_contains_point(color_cell, mouse_position)) {
-                    color_picker->proto_rect->color = colors[i];
-                    break;
-                }
-            }
-        } break;
+    int selected = 0;
+
+    for (ColorPickerSlider index = 0;
+         !selected && index < COLOR_SLIDER_N;
+         ++index) {
+        if (slider_event(
+                &color_picker->sliders[index],
+                event,
+                rect(0.0f, COLOR_SLIDER_HEIGHT * (float) (index + 1),
+                     COLOR_SLIDER_WIDTH, COLOR_SLIDER_HEIGHT),
+                &selected) < 0) {
+            return -1;
         }
-    } break;
+    }
+
+    if (selected_out) {
+        *selected_out = selected;
     }
 
     return 0;
 }
+
+Color color_picker_rgba(const ColorPicker *color_picker)
+{
+    return hsla(
+        color_picker->sliders[COLOR_SLIDER_HUE].value,
+        color_picker->sliders[COLOR_SLIDER_SAT].value,
+        color_picker->sliders[COLOR_SLIDER_LIT].value,
+        1.0f);
+}