feat: Preserve map's last edited layer in its metadata for ergonomy

utopia-rise · Mar 20, 2024 · 746b5c1 · 746b5c1
1 parent 4ed5275
commit 746b5c1
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 10 deletions.
diff --git a/src/editor/commands/revert_command.h b/src/editor/commands/revert_command.h
@@ -12,7 +12,7 @@ namespace editor {
         public:
             void redo() override;
             void undo() override;
-            void set_context_node(TContextNode* p_context_node);
+            void set_context_node(TContextNode* p_context_node) override;
 
             void set_reverse_command(Ref<Command<TContextNode>> p_reverse_command);
 

diff --git a/src/editor/inspector/layers_editor.cpp b/src/editor/inspector/layers_editor.cpp
@@ -28,15 +28,16 @@ LayersEditor::LayersEditor() : layer_line_edit(nullptr), layer_controls_containe
     layer_controls_container->set_h_size_flags(SizeFlags::SIZE_EXPAND_FILL);
     scroll_container->add_child(layer_controls_container);
     add_child(scroll_container);
+
+    current_layer_button_group = Ref<ButtonGroup>();
+    current_layer_button_group.instantiate();
+
     refresh();
 
     scroll_container->set_h_size_flags(SizeFlags::SIZE_EXPAND_FILL);
     scroll_container->set_v_size_flags(SizeFlags::SIZE_EXPAND_FILL);
     set_h_size_flags(SizeFlags::SIZE_EXPAND_FILL);
     set_v_size_flags(SizeFlags::SIZE_EXPAND_FILL);
-
-    current_layer_button_group = Ref<ButtonGroup>();
-    current_layer_button_group.instantiate();
 }
 
 void LayersEditor::refresh() {
@@ -61,6 +62,13 @@ void LayersEditor::refresh() {
         layer_controls_container->add_child(is_visible_label);
         layer_controls_container->add_child(remove_label);
 
+        uint32_t last_layer_edited {
+            current_map->get_meta(
+              node::IsometricMap::LAST_EDITED_LAYER_META_NAME,
+              node::IsometricMap::DEFAULT_LAYER_ID
+            )
+        };
+
         const Dictionary& layers = current_map->get_layers();
         Array ids = layers.keys();
         Array layer_names = layers.values();
@@ -81,6 +89,8 @@ void LayersEditor::refresh() {
             layer_remove_button->set_layer_informations(layer_id, layer_name);
             layer_remove_button->connect(SNAME("pressed"), Callable(this, "refresh"));
             layer_controls_container->add_child(layer_remove_button);
+
+            current_layer_check_box->set_pressed(layer_id == last_layer_edited);
         }
     }
 }
@@ -229,8 +239,14 @@ void CurrentLayerCheckBox::set_layer_id(uint32_t p_layer_id) {
     layer_id = p_layer_id;
 }
 
-CurrentLayerCheckBox::CurrentLayerCheckBox() : layer_id(node::IsometricMap::NO_LAYER_ID) {
+void CurrentLayerCheckBox::on_pressed() {
+    if (node::IsometricMap* current_map{IsometricEditorPlugin::get_instance()->get_selected_map()}) {
+        current_map->set_meta(node::IsometricMap::LAST_EDITED_LAYER_META_NAME,layer_id);
+    }
+}
 
+CurrentLayerCheckBox::CurrentLayerCheckBox() : layer_id(node::IsometricMap::NO_LAYER_ID) {
+    connect(SNAME("pressed"), callable_mp(this, &CurrentLayerCheckBox::on_pressed));
 }
 
 void CurrentLayerCheckBox::_bind_methods() {

diff --git a/src/editor/inspector/layers_editor.h b/src/editor/inspector/layers_editor.h
@@ -2,11 +2,12 @@
 #define ISOMETRIC_MAPS_LAYERS_EDITOR_H
 
 #ifdef TOOLS_ENABLED
-#include "scene/gui/box_container.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/button.h"
-#include "scene/gui/check_box.h"
-#include "scene/gui/grid_container.h"
+#include "node/isometric_map.h"
+#include <scene/gui/box_container.h>
+#include <scene/gui/button.h>
+#include <scene/gui/check_box.h>
+#include <scene/gui/grid_container.h>
+#include <scene/gui/line_edit.h>
 
 namespace editor {
     namespace inspector {
@@ -73,6 +74,8 @@ namespace editor {
             uint32_t get_layer_id() const;
             void set_layer_id(uint32_t p_layer_id);
 
+            void on_pressed();
+
             CurrentLayerCheckBox();
 
         private:

diff --git a/src/node/isometric_map.h b/src/node/isometric_map.h
@@ -14,6 +14,10 @@ namespace node {
         static constexpr uint32_t DEFAULT_LAYER_ID = 0;
         static constexpr uint32_t NO_LAYER_ID = 0xffffffff;
 
+#ifdef TOOLS_ENABLED
+        static constexpr const char* LAST_EDITED_LAYER_META_NAME = "_LAST_EDITED_LAYER";
+#endif
+
     private:
         containers::Grid3D<int, resource::PositionableSet::NONE_POSITIONABLE_ID> grid_3d;
         containers::Grid3D<uint32_t, DEFAULT_LAYER_ID> layers_grid_3d;