Full HSV navigation pane and controls for it, other small things

diff --git a/source/main.c b/source/main.c
index c9df6ae795d83c7c9455274a00a840d7fd7814df..6b989b3f8d622a1ce2716b140aaa02c31cedd3ee 100644 (file)
--- a/source/main.c
+++ b/source/main.c
@@ -18,7 +18,8 @@ int init()
        signal(SIGKILL, killterm_handler);
        signal(SIGTERM, killterm_handler);
 
-       gi.window = (Rect){.x = 0.0f, .y = 0.0f, .w = 2*512.0f, .h = 2*512.0f};
+       float scale = 1.5f;
+       gi.window = (Rect){.x = 0.0f, .y = 0.0f, .w = scale*512.0f, .h = scale*512.0f};
 
        // satisfying rel.[xy]*2 == .[wh] centers axis in parent container
        gi.rgb_square.rel = (Rect){.x = 0.05, .y = 0.05, .w = 0.5, .h = 0.5};

diff --git a/source/sdl/SDL_Utils.c b/source/sdl/SDL_Utils.c
index 11335fda6ed8091d25df98a27e6bac502b19de9a..f54d46eed0b73e0df063080e2573a7635723f799 100644 (file)
--- a/source/sdl/SDL_Utils.c
+++ b/source/sdl/SDL_Utils.c
@@ -5,7 +5,6 @@
 #include "../Math_Utils.h"
 
 #define unroll_sdl_color(color) color.r, color.g, color.b, color.a
-#define lineColorFPoints(r, a, b, c) lineColor(r, a.x - camera_offset.x, a.y - camera_offset.y, b.x - camera_offset.x, b.y - camera_offset.y, c)
 
 SDL_Color red = {255, 0, 0, 255};
 SDL_Color green = {0, 255, 0, 255};
@@ -21,9 +20,6 @@ int32_t init_renderer(Game_Info* gi)
 {
        mgr.pad = NULL;
 
-       // default game states
-       // start overriding these with configs
-
        //load_config(argv[1], gs);
 
        SDL_SetMainReady();
@@ -64,18 +60,53 @@ int32_t delay(int32_t delay_time)
        return 0;
 }
 
-int32_t render_rgb_square(Game_Info* gi)
+// Rename this eventually
+// It's actually HSL
+int32_t render_rgb_square(Game_Info* gi, SDL_FRect* container)
 {
-       SDL_SetRenderDrawColor(mgr.rend, 0x00, 0x00, 0x00, 0xFF);
-       gi->rgb_square.real = fr_margin_adjust(gi->window, gi->rgb_square.rel);
-       SDL_RenderFillRectF(mgr.rend, &gi->rgb_square.real);
+       HSL_Color active_hsl = gi->active_hsl;
+       SDL_Color hsl_pixel;
+       SDL_Point draw_point;
+       SDL_SetRenderDrawColor(mgr.rend, unroll_sdl_color(gi->active_rgb));
+       SDL_RenderFillRectF(mgr.rend, container);
+
+       // I guess not much other way than good ol' n^2
+       // hmmm we'll fix this later
+
+       active_hsl.s = 0;
+       active_hsl.l = 0;
+       for (int r = 0; r < container->w; r++)
+       {
+               active_hsl.s = ((float)r/(float)container->w) * 100;
+               for (int c = 0; c < container->h; c++)
+               {
+                       active_hsl.l = ((float)1.0-c/(float)container->h) * 100;
+
+                       hsl_pixel = hsl_to_rgb(active_hsl);
+                       SDL_SetRenderDrawColor(mgr.rend, unroll_sdl_color(hsl_pixel));
+                       SDL_RenderDrawPoint(mgr.rend, r+container->x, c+container->y);
+               }
+       }
+
+       float s_norm = (float)gi->active_hsl.s/100.0f;
+       float l_norm = (float)gi->active_hsl.l/100.0f;
+       SDL_Rect cursor = {
+               .x = ((s_norm) * container->w) + container->x,
+               .y = ((1.0f - l_norm) * container->h) + container->y,
+               .w = 10,
+               .h = 10
+       };
+       SDL_SetRenderDrawColor(mgr.rend, unroll_sdl_color(black));
+       SDL_RenderDrawLine(mgr.rend, container->x-16, cursor.y, container->x+container->w+16, cursor.y);
+       SDL_RenderDrawLine(mgr.rend, cursor.x, container->y-16, cursor.x, container->y+container->h+16);
 
        return 0;
 }
 
-int32_t render_solid_color(Game_Info* gi, SDL_FRect* container, SDL_Color color)
+int32_t render_color_preview(Game_Info* gi, SDL_FRect* container)
 {
-       SDL_SetRenderDrawColor(mgr.rend, unroll_sdl_color(color));
+       gi->active_rgb = hsl_to_rgb(gi->active_hsl);
+       SDL_SetRenderDrawColor(mgr.rend, unroll_sdl_color(gi->active_rgb));
        SDL_RenderFillRectF(mgr.rend, container);
 
        return 0;
@@ -123,6 +154,7 @@ int32_t display(Game_Info* gi)
 
        // this would be really cool to turn into some stack-based type of thing
        // Also, if resizing is disabled, this can be moved to a static initialization section
+       // orrrr, maybe we can finally do callbacks
        render_container(gi, &gi->window, &gi->rgb_square, green);
        render_container(gi, &gi->window, &gi->hue_slider, green);
        render_container(gi, &gi->window, &gi->info_container, blue);
@@ -137,10 +169,10 @@ int32_t display(Game_Info* gi)
                        render_container(gi, &gi->hsl_info.real, &gi->saturation, blue);
                        render_container(gi, &gi->hsl_info.real, &gi->luminence, red);
 
-       render_solid_color(gi, &gi->final_sample.real, gi->active_rgb);
+       render_color_preview(gi, &gi->final_sample.real);
        render_vertical_hue_spectrum(gi, &gi->hue_slider.real);
+       render_rgb_square(gi, &gi->rgb_square.real);
 
-       // This is kinda the important stuff
        SDL_RenderPresent(mgr.rend);
        return 0;
 }
@@ -156,16 +188,32 @@ int32_t check_inputs(Game_Info* gi)
                                case SDLK_q:
                                        gi->game_alive = 0;
                                        break;
-                               case SDLK_j:
+                               case SDLK_b:
                                        gi->active_hsl.h += 1;
                                        if(gi->active_hsl.h > 360)
                                                gi->active_hsl.h -= 360;
                                        break;
-                               case SDLK_k:
+                               case SDLK_n:
                                        gi->active_hsl.h -= 1;
                                        if(gi->active_hsl.h < 0)
                                                gi->active_hsl.h += 360;
                                        break;
+                               case SDLK_k:
+                                       if(gi->active_hsl.l < 100)
+                                               gi->active_hsl.l += 1;
+                                       break;
+                               case SDLK_j:
+                                       if(gi->active_hsl.l > 0)
+                                               gi->active_hsl.l -= 1;
+                                       break;
+                               case SDLK_l:
+                                       if(gi->active_hsl.s < 100)
+                                               gi->active_hsl.s += 1;
+                                       break;
+                               case SDLK_h:
+                                       if(gi->active_hsl.s > 0)
+                                               gi->active_hsl.s -= 1;
+                                       break;
                        }
                }
        }

diff --git a/source/structs.h b/source/structs.h
index 367ccc2bdd5407212febb6bddf6e8d79c1e4a1b7..6a160861bc4a6435006da7be4d6678e8d273cdb7 100644 (file)
--- a/source/structs.h
+++ b/source/structs.h
@@ -33,8 +33,8 @@ typedef struct
        // Internet says hue likes to go 0-360
        // Saturation and luminence are 0-100
        int16_t h;
-       uint8_t s;
-       uint8_t l;
+       int8_t s;
+       int8_t l;
        uint8_t a;
 
 } HSL_Color;