celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-15 20:08:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix viewport selection happening if clicked outside of viewport and dragged in

Browse Source
This commit is contained in:
Antoine Pilote
2023-07-19 11:25:51 -04:00
parent c3f740883d
commit ecf26ef9ed
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Editor/src/Windows/EditorInterface.cpp
View File

@@ -79,6 +79,7 @@ namespace Nuake {
{
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
std::string name = ICON_FA_GAMEPAD + std::string(" Scene");
if (ImGui::Begin(name.c_str()))
{
ImGui::PopStyleVar();
@@ -242,8 +243,11 @@ namespace Nuake {
}
}
if (m_IsHoveringViewport && Input::IsMouseButtonPressed(GLFW_MOUSE_BUTTON_1) && !ImGuizmo::IsUsing())
m_IsViewportFocused = ImGui::IsWindowFocused();
if (m_IsHoveringViewport && Input::IsMouseButtonPressed(GLFW_MOUSE_BUTTON_2) && !ImGuizmo::IsUsing())
{
ImGui::FocusWindow(ImGui::GetCurrentWindow());
const auto windowPosNuake = Vector2(windowPos.x, windowPos.y);
auto& gbuffer = Engine::GetCurrentScene()->mSceneRenderer->GetGBuffer();
auto pixelPos = Input::GetMousePosition() - windowPosNuake;
@@ -1513,7 +1517,11 @@ namespace Nuake {
}
auto& editorCam = Engine::GetCurrentScene()->m_EditorCamera;
editorCam->Update(ts, m_IsHoveringViewport);
if (m_IsViewportFocused)
{
editorCam->Update(ts, m_IsHoveringViewport);
}
const bool entityIsSelected = Selection.Type == EditorSelectionType::Entity && Selection.Entity.IsValid();
if (entityIsSelected && Input::IsKeyPressed(GLFW_KEY_F))

2
Editor/src/Windows/EditorInterface.h
View File

@@ -26,6 +26,8 @@ namespace Nuake
bool m_DebugCollisions = true;
bool m_ShowOverlay = true;
bool m_IsHoveringViewport = false;
bool m_IsViewportFocused = false;
Vector2 m_ViewportPos = {0, 0};
Vector2 m_ViewportSize = {};