ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-03 04:28:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

in the case of unspecified colors in cfg, default fill them from the preset theme with the most similar background; this will mean that even with totally custom themes, as new color codes are added to the frontend, people will get sensible defaults. if they are just using a preset, then they will get the default new values by default

Browse Source
This commit is contained in:
Ryan Fleury
2024-01-29 16:24:41 -08:00
parent 0ce5239404
commit d2bdf512cf
2 changed files with 88 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_gfx.c
+33
View File
@@ -11476,6 +11476,7 @@ df_gfx_begin_frame(Arena *arena, DF_CmdList *cmds)
}
//- rjf: apply theme colors
B8 theme_color_hit[DF_ThemeColor_COUNT] = {0};
MemoryCopy(df_gfx_state->cfg_theme_target.colors, df_g_theme_preset_colors__default_dark, sizeof(df_g_theme_preset_colors__default_dark));
MemoryCopy(df_gfx_state->cfg_theme.colors, df_g_theme_preset_colors__default_dark, sizeof(df_g_theme_preset_colors__default_dark));
DF_CfgVal *colors = df_cfg_val_from_string(table, str8_lit("colors"));
@@ -11499,6 +11500,7 @@ df_gfx_begin_frame(Arena *arena, DF_CmdList *cmds)
}
if(color_code != DF_ThemeColor_Null)
{
theme_color_hit[color_code] = 1;
DF_CfgNode *hex_cfg = color->first;
String8 hex_string = hex_cfg->string;
U64 hex_val = 0;
@@ -11515,6 +11517,7 @@ df_gfx_begin_frame(Arena *arena, DF_CmdList *cmds)
//- rjf: apply theme presets
DF_CfgVal *color_preset = df_cfg_val_from_string(table, str8_lit("color_preset"));
B32 preset_applied = 0;
if(color_preset != &df_g_nil_cfg_val)
{
String8 color_preset_name = color_preset->last->first->string;
@@ -11531,11 +11534,41 @@ df_gfx_begin_frame(Arena *arena, DF_CmdList *cmds)
}
if(found_preset)
{
preset_applied = 1;
MemoryCopy(df_gfx_state->cfg_theme_target.colors, df_g_theme_preset_colors_table[preset], sizeof(df_g_theme_preset_colors__default_dark));
MemoryCopy(df_gfx_state->cfg_theme.colors, df_g_theme_preset_colors_table[preset], sizeof(df_g_theme_preset_colors__default_dark));
}
}
//- rjf: no preset -> autofill all missing colors from the preset with the most similar background
if(!preset_applied)
{
DF_ThemePreset closest_preset = DF_ThemePreset_DefaultDark;
F32 closest_preset_bg_distance = 100000000;
for(DF_ThemePreset p = (DF_ThemePreset)0; p < DF_ThemePreset_COUNT; p = (DF_ThemePreset)(p+1))
{
Vec4F32 cfg_bg = df_gfx_state->cfg_theme_target.colors[DF_ThemeColor_PlainBackground];
Vec4F32 pre_bg = df_g_theme_preset_colors_table[p][DF_ThemeColor_PlainBackground];
Vec4F32 diff = sub_4f32(cfg_bg, pre_bg);
Vec3F32 diff3 = diff.xyz;
F32 distance = length_3f32(diff3);
if(distance < closest_preset_bg_distance)
{
closest_preset = p;
closest_preset_bg_distance = distance;
}
}
for(DF_ThemeColor c = (DF_ThemeColor)(DF_ThemeColor_Null+1);
c < DF_ThemeColor_COUNT;
c = (DF_ThemeColor)(c+1))
{
if(!theme_color_hit[c])
{
df_gfx_state->cfg_theme_target.colors[c] = df_gfx_state->cfg_theme.colors[c] = df_g_theme_preset_colors_table[closest_preset][c];
}
}
}
//- rjf: if theme colors are all zeroes, then set to default - config appears busted
{
B32 all_colors_are_zero = 1;