From bbd7f8aabe0148b791fa6993916830d992987fcc Mon Sep 17 00:00:00 2001 From: luboslenco Date: Tue, 17 Sep 2019 12:38:10 +0200 Subject: [PATCH] Reload linked assets stubs --- Sources/arm/Config.hx | 1 + Sources/arm/Project.hx | 4 ++++ Sources/arm/ui/UIMenu.hx | 1 + Sources/arm/ui/UITrait.hx | 1 + 4 files changed, 7 insertions(+) diff --git a/Sources/arm/Config.hx b/Sources/arm/Config.hx index 672e5312..a90954cd 100644 --- a/Sources/arm/Config.hx +++ b/Sources/arm/Config.hx @@ -61,6 +61,7 @@ class Config { raw.keymap.file_open = "ctrl+o"; raw.keymap.file_save = "ctrl+s"; raw.keymap.file_save_as = "ctrl+shift+s"; + raw.keymap.file_reload_assets = "ctrl+r"; raw.keymap.edit_undo = "ctrl+z"; raw.keymap.edit_redo = "ctrl+shift+z"; raw.keymap.view_reset = "0"; diff --git a/Sources/arm/Project.hx b/Sources/arm/Project.hx index 5db0db6e..fa499103 100644 --- a/Sources/arm/Project.hx +++ b/Sources/arm/Project.hx @@ -211,6 +211,10 @@ class Project { Scene.active.world.probe.raw.strength = 4.0; }); } + + public static function reloadAssets() { + + } } typedef TProjectFormat = { diff --git a/Sources/arm/ui/UIMenu.hx b/Sources/arm/ui/UIMenu.hx index 31d813bf..3e1be29b 100644 --- a/Sources/arm/ui/UIMenu.hx +++ b/Sources/arm/ui/UIMenu.hx @@ -66,6 +66,7 @@ class UIMenu { if (ui.button("Open...", Left, 'Ctrl+O')) Project.projectOpen(); if (ui.button("Save", Left, 'Ctrl+S')) Project.projectSave(); if (ui.button("Save As...", Left, 'Ctrl+Shift+S')) Project.projectSaveAs(); + if (ui.button("Reload Assets", Left, 'Ctrl+R')) Project.reloadAssets(); // ui.button("Import Asset...", Left); // ui.button("Export Textures...", Left); // ui.button("Export Mesh...", Left); diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx index 04330303..4855abf7 100644 --- a/Sources/arm/ui/UITrait.hx +++ b/Sources/arm/ui/UITrait.hx @@ -450,6 +450,7 @@ class UITrait { if (Operator.shortcut(Config.keymap.file_save_as)) Project.projectSaveAs(); else if (Operator.shortcut(Config.keymap.file_save)) Project.projectSave(); else if (Operator.shortcut(Config.keymap.file_open)) Project.projectOpen(); + else if (Operator.shortcut(Config.keymap.file_reload_assets)) Project.reloadAssets(); else if (Operator.shortcut(Config.keymap.file_new)) UIBox.newProject(); else if (Operator.shortcut(Config.keymap.export_textures)) { if (textureExportPath == "") { // First export, ask for path