fix(ux): imgui warning on button having same id, keyboard was conflicting while typing (interpreted as actions)

Author: Arcod7

include/Scene/Interactive/SceneInteractive.hpp

@@ -160,7 +160,7 @@ namespace Raytracer {
         void addSelectableSkybox(const std::filesystem::directory_entry &entry);
         void addSelectableScene(const std::filesystem::directory_entry &entry);
 
-        void guiColoredSquare(const Color &color);
+        void guiColoredSquare(const Color &color, int id);
         #endif
 
         /////////////////////////////////
@@ -199,7 +199,6 @@ namespace Raytracer {
         float m_selectedPrimitiveTransparency;
         #endif
         bool m_addToCurrentScene = false;
-        bool m_isWriting = false;
         size_t m_renderResolution;
         size_t m_imageHeight;
         size_t m_imageWidth;

src/scene/interactive/handleEvents.cpp

@@ -12,12 +12,14 @@
 namespace Raytracer {
     void SceneInteractive::handleEvents(void)
     {
-        if (m_isWriting)
+        #ifdef BONUS
+        if (ImGui::IsAnyItemActive())
             resetActions();
+        #endif
 
         while (const std::optional<sf::Event> event = m_window.pollEvent()) {
             #ifdef BONUS
-                ImGui::SFML::ProcessEvent(m_window, *event);
+            ImGui::SFML::ProcessEvent(m_window, *event);
             #endif
 
             if (event->is<sf::Event::Closed>()) {
@@ -36,18 +38,21 @@ namespace Raytracer {
                 m_needRendering = true;
             }
 
-            if (!m_isWriting) {
+            #ifdef BONUS
+            if (!ImGui::IsAnyItemActive()) {
+            #endif
                 if (const auto* keyReleased = event->getIf<sf::Event::KeyReleased>()) {
                     applyKeyReleasedActions(keyReleased->code);
                 }
                 if (const auto* keyPressed = event->getIf<sf::Event::KeyPressed>()) {
                     applyKeyPressedActions(keyPressed->code);
                 }
+                if (m_interacCam.handleInput(*event, m_actions)) {
+                    // Handle camera input
+                }
+            #ifdef BONUS
             }
-
-            if (!m_isWriting && m_interacCam.handleInput(*event, m_actions)) {
-                // Handle camera input
-            }
+            #endif
 
             if (const auto* mouseReleased = event->getIf<sf::Event::MouseButtonReleased>()) {
                 if (mouseReleased->button == sf::Mouse::Button::Right) {

src/scene/interactive/imgui/commonEditing.cpp

@@ -9,9 +9,9 @@
 
 namespace Raytracer
 {
-    void SceneInteractive::guiColoredSquare(const Color &color)
+    void SceneInteractive::guiColoredSquare(const Color &color, int id)
     {
-        ImGui::ColorButton(" ", ImVec4(color.getR(),
+        ImGui::ColorButton(std::to_string(id).c_str(), ImVec4(color.getR(),
             color.getG(), color.getB(), 1.0f),
             ImGuiColorEditFlags_InputRGB);
     }

src/scene/interactive/imgui/guiMenuBar.cpp

@@ -39,11 +39,9 @@ namespace Raytracer
 
     void SceneInteractive::guiMenuBar(void)
     {
-        m_isWriting = false;
         if (ImGui::BeginMenuBar()) {
             // Save scene to .cfg
             if (ImGui::BeginMenu("Save as ...")) {
-                m_isWriting = true;
                 std::string hint("custom_scene.cfg");
                 if (ImGui::InputTextWithHint(" File name (press ENTER to save)",
                 hint.c_str(), m_saveFileBuf, FILE_BUF_SIZE,
@@ -57,7 +55,6 @@ namespace Raytracer
             }
 
             if (ImGui::BeginMenu("Load scene")) {
-                m_isWriting = true;
                 if (ImGui::InputTextWithHint(" File name (press ENTER to load)",
                 "scenes/custom_scene.cfg", m_loadFileBuf, FILE_BUF_SIZE,
                 ImGuiInputTextFlags_EnterReturnsTrue)) {
@@ -88,7 +85,6 @@ namespace Raytracer
             }
 
             if (ImGui::BeginMenu("Skybox path")) {
-                m_isWriting = true;
                 Skybox &skybox = m_scene->getSkybox();
                 bool skyboxHasTexture = skybox.hasTexture();
                 if (ImGui::Checkbox("Has texture", &skyboxHasTexture)) {

src/scene/interactive/imgui/inventory/guiInventoryTab.cpp

@@ -29,7 +29,7 @@ namespace Raytracer
                     switch (material->getType()) {
                     case MaterialType::SOLID: {
                         ImGui::SameLine();
-                        guiColoredSquare(static_cast<MaterialSolid *>(material.get())->getColor());
+                        guiColoredSquare(static_cast<MaterialSolid *>(material.get())->getColor(), i);
                         break;
                     }
                     case MaterialType::TEXTURE:

src/scene/interactive/imgui/light/guiLightTab.cpp

@@ -35,7 +35,7 @@ namespace Raytracer
                     if (ImGui::Selectable(name.c_str(), m_selectedObject == i))
                         m_selectedObject = i;
                     ImGui::SameLine();
-                    guiColoredSquare(light->getColor());
+                    guiColoredSquare(light->getColor(), i);
                     i++;
                 }
             }

src/scene/interactive/imgui/obj/guiObjTab.cpp

@@ -25,7 +25,7 @@ namespace Raytracer
                         m_selectedObject = i;
                     if (obj->getMaterial()->getType() == MaterialType::SOLID) {
                         ImGui::SameLine();
-                        guiColoredSquare(static_cast<MaterialSolid *>(obj->getMaterial().get())->getColor());
+                        guiColoredSquare(static_cast<MaterialSolid *>(obj->getMaterial().get())->getColor(), i);
                     }
                     i++;
                 }

src/scene/interactive/imgui/primitives/guiPrimitiveTab.cpp

@@ -28,7 +28,7 @@ namespace Raytracer
                         m_selectedObject = i;
                     if (prim->getMaterial()->getType() == MaterialType::SOLID) {
                         ImGui::SameLine();
-                        guiColoredSquare(static_cast<MaterialSolid *>(prim->getMaterial().get())->getColor());
+                        guiColoredSquare(static_cast<MaterialSolid *>(prim->getMaterial().get())->getColor(), i);
                     }
                     i++;
                 }