[#182]: Fix selecting objects in Editor

JacobDomagala · Jan 11, 2024 · 71eae31 · 71eae31
1 parent b355d79
commit 71eae31
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/editor/editor.cpp b/editor/editor.cpp
@@ -144,10 +144,11 @@ Editor::MouseButtonCallback(MouseButtonEvent& event)
    if (!playGame_ && !EditorGUI::IsBlockingEvents() && levelLoaded_)
    {
       const auto mousePressed = event.action_ == GLFW_PRESS;
+      const auto mouseReleased = event.action_ == GLFW_RELEASE;
       LMBPressedLastUpdate_ = mousePressed and event.button_ == GLFW_MOUSE_BUTTON_1;
       RMBPressedLastUpdate_ = mousePressed and event.button_ == GLFW_MOUSE_BUTTON_2;
 
-      if (mousePressed)
+      if (mouseReleased and not mouseDrag_)
       {
          CheckIfObjectGotSelected(InputManager::GetMousePos(),
                                   InputManager::CheckKeyPressed(GLFW_KEY_LEFT_CONTROL));

diff --git a/engine/game/level.cpp b/engine/game/level.cpp
@@ -405,7 +405,7 @@ Level::GetTilesFromRectangle(const std::array< glm::vec2, 4 >& rect) const
       const auto w =
          static_cast< int32_t >(glm::floor(position.x / static_cast< float >(tileWidth)));
       const auto h =
-         static_cast< int32_t >(glm::floor(position.y / static_cast< float >(tileWidth)));
+         static_cast< int32_t >(glm::ceil(position.y / static_cast< float >(tileWidth)));
 
       return {glm::clamp(w, 0, (levelSize.x / static_cast< int32_t >(tileWidth)) - 1),
               glm::clamp(h, 0, (levelSize.y / static_cast< int32_t >(tileWidth))) - 1};