feat(tesseratos): add/remove components in Entity Inspector

GameDevTecnico · Feb 11, 2024 · 79ffd0e · 79ffd0e
1 parent 54c99a0
commit 79ffd0e
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Metrics panel plugin, which only shows FPS statistics for now (#275).
 - Parent-child hierarchies to the transform plugin, at last (#334).
 - New trait type for handling bit masks.
+- Buttons to add/remove components through the entity inspector (#906).
 
 ### Changed
 

diff --git a/tools/tesseratos/src/tesseratos/entity_inspector/plugin.cpp b/tools/tesseratos/src/tesseratos/entity_inspector/plugin.cpp
@@ -12,6 +12,7 @@
 
 using cubos::core::ecs::Entity;
 using cubos::core::ecs::World;
+using cubos::core::memory::AnyValue;
 using cubos::core::reflection::reflect;
 using cubos::core::reflection::Type;
 
@@ -24,39 +25,63 @@ void tesseratos::entityInspectorPlugin(Cubos& cubos)
     cubos.addPlugin(entitySelectorPlugin);
     cubos.addPlugin(toolboxPlugin);
 
-    cubos.system("show Entity Inspector UI").tagged("cubos.imgui").call([](World& world) {
-        if (!world.write<Toolbox>().get().isOpen("Entity Inspector"))
-        {
-            return;
-        }
-
-        ImGui::Begin("Entity Inspector");
-        if (!ImGui::IsWindowCollapsed())
-        {
-            auto selection = world.read<EntitySelector>().get().selection;
+    cubos.system("show Entity Inspector UI")
+        .tagged("cubos.imgui")
+        .call([](World& world, Toolbox& toolbox, const EntitySelector& entitySelector, DataInspector& dataInspector) {
+            if (!toolbox.isOpen("Entity Inspector"))
+            {
+                return;
+            }
 
-            if (!selection.isNull() && world.isAlive(selection))
+            ImGui::Begin("Entity Inspector");
+            if (!ImGui::IsWindowCollapsed())
             {
-                ImGui::Text("Entity %d selected", selection.index);
-                ImGui::BeginTable("showEntity", 2, ImGuiTableFlags_BordersOuter | ImGuiTableFlags_Resizable);
-                auto dataInspector = world.write<DataInspector>();
+                if (!entitySelector.selection.isNull() && world.isAlive(entitySelector.selection))
+                {
+                    ImGui::Text("Entity %d selected", entitySelector.selection.index);
+                    ImGui::Separator();
 
-                ImGui::TableNextRow();
+                    if (ImGui::Button("Add Component"))
+                    {
+                        ImGui::OpenPopup("Select Component Type");
+                    }
 
-                for (auto [type, value] : world.components(selection))
-                {
-                    if (dataInspector.get().edit(type->name(), *type, value))
+                    if (ImGui::BeginPopup("Select Component Type"))
+                    {
+                        for (auto [type, name] : world.types().components())
+                        {
+                            if (ImGui::Button(name.c_str()))
+                            {
+                                auto value = AnyValue::defaultConstruct(*type);
+                                world.components(entitySelector.selection).add(value.type(), value.get());
+                                ImGui::CloseCurrentPopup();
+                            }
+                        }
+
+                        ImGui::EndPopup();
+                    }
+
+                    const Type* removed = nullptr;
+                    for (auto [type, value] : world.components(entitySelector.selection))
+                    {
+                        ImGui::SeparatorText(type->name().c_str());
+                        dataInspector.edit(*type, value);
+                        if (ImGui::Button("Remove Component"))
+                        {
+                            removed = type;
+                        }
+                    }
+
+                    if (removed != nullptr)
                     {
-                        // ...
+                        world.components(entitySelector.selection).remove(*removed);
                     }
                 }
-                ImGui::EndTable();
-            }
-            else
-            {
-                ImGui::Text("No entity selected");
+                else
+                {
+                    ImGui::Text("No entity selected");
+                }
             }
-        }
-        ImGui::End();
-    });
+            ImGui::End();
+        });
 }
diff --git a/tools/tesseratos/src/tesseratos/settings_inspector/plugin.cpp b/tools/tesseratos/src/tesseratos/settings_inspector/plugin.cpp
@@ -41,9 +41,7 @@ void tesseratos::settingsInspectorPlugin(Cubos& cubos)
                 }
                 else
                 {
-                    ImGui::BeginTable("split", 2, ImGuiTableFlags_BordersOuter | ImGuiTableFlags_Resizable);
-                    inspector.edit("Settings", map);
-                    ImGui::EndTable();
+                    inspector.edit(map);
                 }
             }
             ImGui::End();