Fixed a couple of bugs with editor. Still not working correctly, but …

…is atleast runnable.
gscept · Jan 23, 2024 · 3e2538d · 3e2538d
1 parent 92d12dc
commit 3e2538d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/toolkit/editor/editor/ui/windows/outline.cc b/toolkit/editor/editor/ui/windows/outline.cc
@@ -98,12 +98,7 @@ Outline::Run()
     // @todo:   The order of the entites is arbitrary. We should allow the user to move and sort the entities as they like.
     ImGui::BeginChild("ScrollingRegion", ImVec2(0, -ImGui::GetFrameHeightWithSpacing()), false, ImGuiWindowFlags_HorizontalScrollbar);
     {
-        Game::FilterBuilder::FilterCreateInfo filterInfo;
-        filterInfo.inclusive[0] = Game::GetComponentId("Owner"_atm);
-        filterInfo.access   [0] = Game::AccessMode::READ;
-        filterInfo.numInclusive = 1;
-
-        Game::Filter filter = Game::FilterBuilder::CreateFilter(filterInfo);
+        Game::Filter filter = Game::FilterBuilder::FilterBuilder().Including<Game::Entity>().Build();
         Game::Dataset data = state.editorWorld->Query(filter);
 
         bool contextMenuOpened = false;
@@ -149,7 +144,11 @@ Outline::Run()
                     ImGui::SetCursorPosX(xPos);
                     ImGui::TextDisabled("|-");
                     ImGui::SameLine();
-                    ImGui::Image(&UIManager::Icons::game, {20,20});
+
+                    // TODO: make this work again
+                    //ImGui::Image(&UIManager::Icons::game, {20,20});
+                    ImGui::Text(" "); // hack: this just replaces the image until that works again
+
                     ImGui::SameLine();
                     ImGui::SetCursorPosY(yPos + 3);
                     ImGui::Text(edit.name.AsCharPtr());

diff --git a/toolkit/editor/editor/ui/windows/toolbar.cc b/toolkit/editor/editor/ui/windows/toolbar.cc
@@ -92,11 +92,17 @@ Toolbar::Run()
 
     IMGUI_VERTICAL_SEPARATOR;
 
-    if (ImGui::ImageButton("playimage", &UIManager::Icons::play, buttonSize, {0,0}, {1,1})) { PlayGame(); }
+    //if (ImGui::ImageButton("playimage", &UIManager::Icons::play, buttonSize, {0,0}, {1,1})) { PlayGame(); }
+    //ImGui::SameLine();
+    //if (ImGui::ImageButton("pauseimage", &UIManager::Icons::pause, buttonSize, {0,0}, {1,1})) { PauseGame(); }
+    //ImGui::SameLine();
+    //if (ImGui::ImageButton("stopimage", &UIManager::Icons::stop, buttonSize, {0,0}, {1,1})) { StopGame(); }
+
+    if (ImGui::Button("Play")) { PlayGame(); }
     ImGui::SameLine();
-    if (ImGui::ImageButton("pauseimage", &UIManager::Icons::pause, buttonSize, {0,0}, {1,1})) { PauseGame(); }
+    if (ImGui::Button("Pause")) { PauseGame(); }
     ImGui::SameLine();
-    if (ImGui::ImageButton("stopimage", &UIManager::Icons::stop, buttonSize, {0,0}, {1,1})) { StopGame(); }
+    if (ImGui::Button("Stop")) { StopGame(); }
 }
 
 } // namespace Presentation