From 1a7478414380ee697be73227bff3dd5e0b04b2f2 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:49:47 +0530 Subject: [PATCH] remove need for window argument since we init with one --- examples/Demo/main.cpp | 2 +- include/NazaraImgui/NazaraImgui.hpp | 3 ++- src/NazaraImgui/NazaraImgui.cpp | 9 +++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/Demo/main.cpp b/examples/Demo/main.cpp index d895677..28e819d 100644 --- a/examples/Demo/main.cpp +++ b/examples/Demo/main.cpp @@ -84,7 +84,7 @@ int WinMain(int argc, char* argv[]) } float deltaTime = updateClock.GetElapsedTime().AsSeconds(); - Nz::Imgui::Instance()->Update(window, deltaTime); + Nz::Imgui::Instance()->Update(deltaTime); if (ImGui::BeginMainMenuBar()) { diff --git a/include/NazaraImgui/NazaraImgui.hpp b/include/NazaraImgui/NazaraImgui.hpp index 8f70b95..d05983d 100644 --- a/include/NazaraImgui/NazaraImgui.hpp +++ b/include/NazaraImgui/NazaraImgui.hpp @@ -35,7 +35,7 @@ namespace Nz ~Imgui(); bool Init(Nz::Window& window, bool bLoadDefaultFont = true); - void Update(Nz::Window& window, float dt); + void Update(float dt); void Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame); inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; } @@ -71,6 +71,7 @@ namespace Nz ImGuiContext* m_currentContext; std::string m_clipboardText; + Nz::Window* m_window; bool m_bWindowHasFocus; bool m_bMouseMoved; diff --git a/src/NazaraImgui/NazaraImgui.cpp b/src/NazaraImgui/NazaraImgui.cpp index 94604fc..aef2afe 100644 --- a/src/NazaraImgui/NazaraImgui.cpp +++ b/src/NazaraImgui/NazaraImgui.cpp @@ -114,21 +114,22 @@ namespace Nz SetupInputs(window.GetEventHandler()); m_bWindowHasFocus = window.HasFocus(); + m_window = &window; return true; } - void Imgui::Update(Nz::Window& window, float dt) + void Imgui::Update(float dt) { // Update OS/hardware mouse cursor if imgui isn't drawing a software cursor - UpdateMouseCursor(window); + UpdateMouseCursor(*m_window); if (m_bMouseMoved) { - Update(Nz::Mouse::GetPosition(window), window.GetSize(), dt); + Update(Nz::Mouse::GetPosition(*m_window), m_window->GetSize(), dt); } else { - Update({ 0,0 }, window.GetSize(), dt); + Update({ 0,0 }, m_window->GetSize(), dt); } #if UNFINISHED_WORK