sid
/
NazaraImgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove need for window argument since we init with one

This commit is contained in:
SweetId 2023-11-17 12:49:47 +05:30
parent 00fcb37e4a
commit 1a74784143
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Demo/main.cpp
View File

@ -84,7 +84,7 @@ int WinMain(int argc, char* argv[])
} }
float deltaTime = updateClock.GetElapsedTime().AsSeconds(); float deltaTime = updateClock.GetElapsedTime().AsSeconds();
Nz::Imgui::Instance()->Update(window, deltaTime); Nz::Imgui::Instance()->Update(deltaTime);
if (ImGui::BeginMainMenuBar()) if (ImGui::BeginMainMenuBar())
{ {

3
include/NazaraImgui/NazaraImgui.hpp
View File

@ -35,7 +35,7 @@ namespace Nz
~Imgui(); ~Imgui();
bool Init(Nz::Window& window, bool bLoadDefaultFont = true); 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); void Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame);
inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; } inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; }
@ -71,6 +71,7 @@ namespace Nz
ImGuiContext* m_currentContext; ImGuiContext* m_currentContext;
std::string m_clipboardText; std::string m_clipboardText;
Nz::Window* m_window;
bool m_bWindowHasFocus; bool m_bWindowHasFocus;
bool m_bMouseMoved; bool m_bMouseMoved;

9
src/NazaraImgui/NazaraImgui.cpp
View File

@ -114,21 +114,22 @@ namespace Nz
SetupInputs(window.GetEventHandler()); SetupInputs(window.GetEventHandler());
m_bWindowHasFocus = window.HasFocus(); m_bWindowHasFocus = window.HasFocus();
m_window = &window;
return true; 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 // Update OS/hardware mouse cursor if imgui isn't drawing a software cursor
UpdateMouseCursor(window); UpdateMouseCursor(*m_window);
if (m_bMouseMoved) if (m_bMouseMoved)
{ {
Update(Nz::Mouse::GetPosition(window), window.GetSize(), dt); Update(Nz::Mouse::GetPosition(*m_window), m_window->GetSize(), dt);
} }
else else
{ {
Update({ 0,0 }, window.GetSize(), dt); Update({ 0,0 }, m_window->GetSize(), dt);
} }
#if UNFINISHED_WORK #if UNFINISHED_WORK