From efe81831330f7c9ddc232715f30eadb8365d8d4b Mon Sep 17 00:00:00 2001 From: luboslenco Date: Fri, 26 Sep 2025 12:01:24 +0200 Subject: [PATCH] Cleanup --- paint/sources/box_preferences.ts | 9 --------- paint/sources/config.ts | 3 --- paint/sources/context.ts | 2 ++ paint/sources/ui_nodes.ts | 6 +++--- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/paint/sources/box_preferences.ts b/paint/sources/box_preferences.ts index d4e1131a..4d752fde 100644 --- a/paint/sources/box_preferences.ts +++ b/paint/sources/box_preferences.ts @@ -47,15 +47,6 @@ function box_preferences_show() { context_raw.hscale_was_changed = true; } - let h_selected_node_preview: ui_handle_t = ui_handle(__ID__); - if (h_selected_node_preview.init) { - h_selected_node_preview.b = config_raw.selected_node_preview; - } - ui_check(h_selected_node_preview, tr("Selected Node Preview")); - if (h_selected_node_preview.changed) { - config_raw.selected_node_preview = h_selected_node_preview.b; - } - let h_node_previews: ui_handle_t = ui_handle(__ID__); if (h_node_previews.init) { h_node_previews.b = config_raw.node_previews; diff --git a/paint/sources/config.ts b/paint/sources/config.ts index 59e7b73f..d665b5f4 100644 --- a/paint/sources/config.ts +++ b/paint/sources/config.ts @@ -84,7 +84,6 @@ function config_save() { json_encode_f32("displace_strength", config_raw.displace_strength); json_encode_i32("layer_res", config_raw.layer_res); json_encode_bool("brush_live", config_raw.brush_live); - json_encode_bool("selected_node_preview", config_raw.selected_node_preview); json_encode_bool("node_previews", config_raw.node_previews); json_encode_bool("pressure_hardness", config_raw.pressure_hardness); json_encode_bool("pressure_angle", config_raw.pressure_angle); @@ -183,7 +182,6 @@ function config_init() { config_raw.touch_ui = false; config_raw.splash_screen = false; ///end - config_raw.selected_node_preview = true; config_raw.node_previews = false; config_raw.pressure_hardness = true; config_raw.pressure_angle = false; @@ -467,7 +465,6 @@ type config_t = { displace_strength?: f32; layer_res?: i32; brush_live?: bool; - selected_node_preview?: bool; node_previews?: bool; pressure_hardness?: bool; pressure_angle?: bool; diff --git a/paint/sources/context.ts b/paint/sources/context.ts index cb6612a0..62e46b3b 100644 --- a/paint/sources/context.ts +++ b/paint/sources/context.ts @@ -101,6 +101,7 @@ type context_t = { node_preview_name?: string; node_previews?: map_t; node_previews_used?: string[]; + selected_node_preview: bool; mask_preview_rgba32?: gpu_texture_t; mask_preview_last?: slot_layer_t; @@ -326,6 +327,7 @@ function context_create(): context_t { c.layers_preview_dirty = false; c.node_preview_dirty = false; c.node_preview_name = ""; + c.selected_node_preview = true; c.colorid_picked = false; c.material_preview = false; // Drawing material previews c.saved_camera = mat4_identity(); diff --git a/paint/sources/ui_nodes.ts b/paint/sources/ui_nodes.ts index 9b184be5..94d5e96c 100644 --- a/paint/sources/ui_nodes.ts +++ b/paint/sources/ui_nodes.ts @@ -819,7 +819,7 @@ function ui_nodes_render() { ui_nodes_grid_redraw = false; } - if (config_raw.selected_node_preview && context_raw.node_preview_dirty) { + if (context_raw.selected_node_preview && context_raw.node_preview_dirty) { ui_nodes_make_node_preview(); } @@ -975,7 +975,7 @@ function ui_nodes_render() { ui_nodes_uichanged_last = ui.changed; // Node previews - if (config_raw.selected_node_preview && nodes.nodes_selected_id.length > 0) { + if (context_raw.selected_node_preview && nodes.nodes_selected_id.length > 0) { let sel: ui_node_t = ui_get_node(c.nodes, nodes.nodes_selected_id[0]); let tw: f32 = 128 * UI_SCALE(); let tx: f32 = ui_nodes_ww - tw - 8 * UI_SCALE(); @@ -983,7 +983,7 @@ function ui_nodes_render() { ui_nodes_draw_node_preview(sel, tx, ty, tw); } - // if (config_raw.selected_node_preview) { + // if (context_raw.selected_node_preview) { // for (let i: i32 = 0; i < c.nodes.length; ++i) { // let n: ui_node_t = c.nodes[i]; // let tw: f32 = 128 * UI_SCALE() * UI_NODES_SCALE();