[#194]: Don't make the recently selected GameObject a main selected o…

…ne, when we're doing group select
JacobDomagala · Feb 25, 2024 · f7cfb93 · f7cfb93
1 parent 9d8007e
commit f7cfb93
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/editor/editor.cpp b/editor/editor.cpp
@@ -181,7 +181,7 @@ Editor::MouseButtonCallback(MouseButtonEvent& event)
 
             for (const auto object : selectedObjects)
             {
-               gui_.ObjectSelected(object);
+               gui_.ObjectSelected(object, true);
                const auto& objectPos =
                   currentLevel_->GetGameObjectRef(object).GetCenteredPosition();
 
@@ -570,7 +570,7 @@ Editor::SelectGameObject(Object::ID newSelectedGameObject)
    }
 
    currentSelectedGameObject_ = newSelectedGameObject;
-   gui_.ObjectSelected(currentSelectedGameObject_);
+   gui_.ObjectSelected(currentSelectedGameObject_, false);
 
    // Make sure to render animation points if needed
    auto& gameObject = currentLevel_->GetGameObjectRef(newSelectedGameObject);

diff --git a/editor/gui/editor_gui.cpp b/editor/gui/editor_gui.cpp
@@ -4,14 +4,14 @@
 #include "game_object.hpp"
 #include "helpers.hpp"
 #include "icons.hpp"
+#include "input/input_manager.hpp"
 #include "renderer/renderer.hpp"
 #include "renderer/shader.hpp"
 #include "renderer/texture.hpp"
 #include "renderer/types.hpp"
 #include "renderer/vulkan_common.hpp"
 #include "types.hpp"
 #include "utils/file_manager.hpp"
-#include "input/input_manager.hpp"
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
@@ -146,7 +146,7 @@ EditorGUI::UpdateUI()
    }
 
    ImGui::Render();
-   
+
    setScrollTo_ = {};
 }
 
@@ -183,12 +183,15 @@ EditorGUI::LevelLoaded(const std::shared_ptr< Level >& loadedLevel)
 }
 
 void
-EditorGUI::ObjectSelected(Object::ID ID)
+EditorGUI::ObjectSelected(Object::ID ID, bool groupSelect)
 {
    objectsInfo_[ID].second = true;
    setScrollTo_ = ID;
 
-   currentlySelectedGameObject_ = ID;
+   if (not groupSelect)
+   {
+      currentlySelectedGameObject_ = ID;
+   }
 }
 
 void

diff --git a/editor/gui/editor_gui.hpp b/editor/gui/editor_gui.hpp
@@ -54,7 +54,7 @@ class EditorGUI : public InputListener
    LevelLoaded(const std::shared_ptr< Level >& loadedLevel);
 
    void
-   ObjectSelected(Object::ID ID);
+   ObjectSelected(Object::ID ID, bool groupSelect);
 
    void
    ObjectUnselected(Object::ID ID);