From 1e7e567dd5bf080011086ac8f83001a45bfc63fb Mon Sep 17 00:00:00 2001 From: luboslenco Date: Sat, 30 Nov 2024 23:39:57 +0100 Subject: [PATCH] Split toolbar code --- armorforge/sources/ui_toolbar_ext.ts | 10 ++++++++++ armorlab/sources/ui_toolbar_ext.ts | 4 ++++ armorpaint/sources/ui_toolbar_ext.ts | 17 +++++++++++++++++ armorsculpt/sources/ui_toolbar_ext.ts | 5 +++++ base/sources/ui_toolbar.ts | 20 +------------------- 5 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 armorforge/sources/ui_toolbar_ext.ts create mode 100644 armorlab/sources/ui_toolbar_ext.ts create mode 100644 armorpaint/sources/ui_toolbar_ext.ts create mode 100644 armorsculpt/sources/ui_toolbar_ext.ts diff --git a/armorforge/sources/ui_toolbar_ext.ts b/armorforge/sources/ui_toolbar_ext.ts new file mode 100644 index 00000000..4f53c3f3 --- /dev/null +++ b/armorforge/sources/ui_toolbar_ext.ts @@ -0,0 +1,10 @@ + +function ui_toolbar_ext_draw_tools(ui: ui_t, img: image_t, icon_accent: i32, keys: string[]) { + + ui_toolbar_draw_tool(workspace_tool_t.GIZMO, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.BRUSH, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.ERASER, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.FILL, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.PARTICLE, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.PICKER, ui, img, icon_accent, keys); +} diff --git a/armorlab/sources/ui_toolbar_ext.ts b/armorlab/sources/ui_toolbar_ext.ts new file mode 100644 index 00000000..3f560f9d --- /dev/null +++ b/armorlab/sources/ui_toolbar_ext.ts @@ -0,0 +1,4 @@ + +function ui_toolbar_ext_draw_tools(ui: ui_t, img: image_t, icon_accent: i32, keys: string[]) { + +} diff --git a/armorpaint/sources/ui_toolbar_ext.ts b/armorpaint/sources/ui_toolbar_ext.ts new file mode 100644 index 00000000..75c91b84 --- /dev/null +++ b/armorpaint/sources/ui_toolbar_ext.ts @@ -0,0 +1,17 @@ + +function ui_toolbar_ext_draw_tools(ui: ui_t, img: image_t, icon_accent: i32, keys: string[]) { + + ui_toolbar_draw_tool(workspace_tool_t.BRUSH, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.ERASER, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.FILL, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.DECAL, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.TEXT, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.CLONE, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.BLUR, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.SMUDGE, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.PARTICLE, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.COLORID, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.PICKER, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.BAKE, ui, img, icon_accent, keys); + ui_toolbar_draw_tool(workspace_tool_t.MATERIAL, ui, img, icon_accent, keys); +} diff --git a/armorsculpt/sources/ui_toolbar_ext.ts b/armorsculpt/sources/ui_toolbar_ext.ts new file mode 100644 index 00000000..72f267d7 --- /dev/null +++ b/armorsculpt/sources/ui_toolbar_ext.ts @@ -0,0 +1,5 @@ + +function ui_toolbar_ext_draw_tools(ui: ui_t, img: image_t, icon_accent: i32, keys: string[]) { + + ui_toolbar_draw_tool(workspace_tool_t.BRUSH, ui, img, icon_accent, keys); +} diff --git a/base/sources/ui_toolbar.ts b/base/sources/ui_toolbar.ts index 75ca1662..0d6e7ca1 100644 --- a/base/sources/ui_toolbar.ts +++ b/base/sources/ui_toolbar.ts @@ -182,25 +182,7 @@ function ui_toolbar_render_ui() { key_tool_material ]; - ui_toolbar_draw_tool(workspace_tool_t.BRUSH, ui, img, icon_accent, keys); - ///if is_paint - ui_toolbar_draw_tool(workspace_tool_t.ERASER, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.FILL, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.DECAL, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.TEXT, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.CLONE, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.BLUR, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.SMUDGE, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.PARTICLE, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.COLORID, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.PICKER, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.BAKE, ui, img, icon_accent, keys); - ui_toolbar_draw_tool(workspace_tool_t.MATERIAL, ui, img, icon_accent, keys); - ///end - - ///if is_forge - ui_toolbar_draw_tool(workspace_tool_t.GIZMO, ui, img, icon_accent, keys); - ///end + ui_toolbar_ext_draw_tools(ui, img, icon_accent, keys); ui.image_scroll_align = true; }