WIP: Add editor controls for objects on mouse click

Author: tobbi

src/editor/editor.cpp

@@ -120,6 +120,7 @@ Editor::Editor() :
   m_tileset(nullptr),
   m_has_deprecated_tiles(false),
   m_widgets(),
+  m_controls(),
   m_undo_widget(),
   m_redo_widget(),
   m_grid_size_widget(),
@@ -238,6 +239,14 @@ Editor::draw(Compositor& compositor)
       widget->draw(context);
     }
 
+    context.color().draw_filled_rect(Rectf(0, 32.0f, 200.0f, SCREEN_HEIGHT - 32.0f),
+                                     Color(0.2f, 0.2f, 0.2f), LAYER_GUI);
+
+    for(const auto& control : m_controls)
+    {
+      control->draw(context);
+    }
+
     // If camera scale must be changed, change it here.
     if (m_new_scale != 0.f)
     {
@@ -367,6 +376,11 @@ Editor::update(float dt_sec, const Controller& controller)
       widget->update(dt_sec);
     }
 
+    for(const auto& control : m_controls)
+    {
+      control->update(dt_sec);
+    }
+
     // Now that all widgets have been updated, which should have relinquished
     // pointers to objects marked for deletion, we can actually delete them.
     for (auto& sector : m_level->get_sectors())
@@ -1257,4 +1271,26 @@ Editor::pack_addon()
   *zip.Add_File(id + ".nfo") << ss.rdbuf();
 }
 
+void
+Editor::addControl(const std::string& name, std::unique_ptr<InterfaceControl> new_control)
+{
+  float height = 35.f;
+  for (const auto& control : m_controls) {
+    height = std::max(height, control->get_rect().get_bottom() + 5.f);
+  }
+
+  if (new_control.get()->get_rect().get_width() == 0.f || new_control.get()->get_rect().get_height() == 0.f) {
+    new_control.get()->set_rect(Rectf(100.f, height, 200.f - 1.0f, height + 20.f));
+  } else {
+    new_control.get()->set_rect(Rectf(new_control.get()->get_rect().get_left(),
+                                      height,
+                                      new_control.get()->get_rect().get_right(),
+                                      height + new_control.get()->get_rect().get_height()));
+  }
+
+  new_control.get()->m_label = std::make_unique<InterfaceLabel>(Rectf(3.f, height, 100.f, height + 20.f), std::move(name));
+  //new_control.get()->m_on_change = std::function<void()>([this](){ this->push_version(); });
+  m_controls.push_back(std::move(new_control));
+}
+
 /* EOF */

src/editor/editor.hpp

@@ -28,6 +28,7 @@
 #include "editor/toolbox_widget.hpp"
 #include "editor/layers_widget.hpp"
 #include "editor/scroller_widget.hpp"
+#include "interface/control.hpp"
 #include "supertux/screen.hpp"
 #include "supertux/world.hpp"
 #include "util/currenton.hpp"
@@ -81,6 +82,11 @@ class Editor final : public Screen,
   void event(const SDL_Event& ev) override;
   void on_window_resize() override;
 
+  std::vector<std::unique_ptr<InterfaceControl>>& get_controls()
+  {
+    return m_controls;
+  }
+
   void disable_keyboard() { m_enabled = false; }
 
   inline Level* get_level() const { return m_level.get(); }
@@ -158,6 +164,7 @@ class Editor final : public Screen,
 
   inline Sector* get_sector() { return m_sector; }
 
+  void addControl(const std::string& name, std::unique_ptr<InterfaceControl> new_control);
   void retoggle_undo_tracking();
   void undo_stack_cleanup();
 
@@ -182,7 +189,6 @@ class Editor final : public Screen,
   void save_level(const std::string& filename = "", bool switch_file = false);
   void test_level(const std::optional<std::pair<std::string, Vector>>& test_pos);
   void update_keyboard(const Controller& controller);
-
   void keep_camera_in_bounds();
 
 protected:
@@ -220,6 +226,8 @@ class Editor final : public Screen,
   bool m_has_deprecated_tiles;
 
   std::vector<std::unique_ptr<Widget> > m_widgets;
+  std::vector<std::unique_ptr<InterfaceControl>> m_controls;
+
   ButtonWidget* m_undo_widget;
   ButtonWidget* m_redo_widget;
   ButtonWidget* m_grid_size_widget;

src/editor/overlay_widget.cpp

@@ -22,10 +22,12 @@
 #include "editor/node_marker.hpp"
 #include "editor/object_menu.hpp"
 #include "editor/object_info.hpp"
+#include "editor/object_option.hpp"
 #include "editor/tile_selection.hpp"
 #include "editor/tip.hpp"
 #include "gui/menu.hpp"
 #include "gui/menu_manager.hpp"
+#include "interface/control_textbox.hpp"
 #include "math/bezier.hpp"
 #include "object/camera.hpp"
 #include "object/path_gameobject.hpp"
@@ -878,6 +880,28 @@ EditorOverlayWidget::process_left_click()
 
     case EditorTilebox::InputType::NONE:
     case EditorTilebox::InputType::OBJECT:
+    
+    if (m_hovered_object.get() != nullptr)
+    {
+      // WIP:
+      auto& controls = m_editor.get_controls();
+      controls.clear();
+      ObjectSettings os = m_hovered_object.get()->get_settings();
+      for(const auto& option : os.get_options())
+      {
+        if (dynamic_cast<LabelObjectOption*>(option.get()))
+        {
+          m_editor.addControl(option.get()->get_text(), nullptr);
+        }
+        else
+        {
+          auto textbox = std::make_unique<ControlTextbox>();
+          textbox.get()->set_rect(Rectf(0, 32, 200, 32));
+          textbox.get()->put_text(option.get()->to_string());
+          m_editor.addControl(option.get()->get_text(), std::move(textbox));
+        }
+      }
+    }
       switch (m_editor.get_tileselect_move_mode())
       {
         case 0:

src/object/tilemap.cpp

@@ -632,7 +632,7 @@ TileMap::get_offset() const
   // Apply custom offset for tilemap to fit buttons at the top of the editor. 
   // This extra offset isn't saved.
   if (Editor::is_active() && !Level::current()->is_saving_in_progress())
-    return m_offset + Vector(0, 32);
+    return m_offset + Vector(200, 32);
 
   return m_offset;
 }