From e2aa7cb65c1bcdbda7f4a6474e68ea372af1e0a2 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Fri, 17 Nov 2023 12:52:38 +0530 Subject: [PATCH] renaming RenderInternal to Render. Drawer no longer call RenderInternal --- include/NazaraImgui/NazaraImgui.hpp | 1 + src/NazaraImgui/ImguiDrawer.cpp | 2 -- src/NazaraImgui/NazaraImgui.cpp | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/NazaraImgui/NazaraImgui.hpp b/include/NazaraImgui/NazaraImgui.hpp index d05983d..bc01598 100644 --- a/include/NazaraImgui/NazaraImgui.hpp +++ b/include/NazaraImgui/NazaraImgui.hpp @@ -36,6 +36,7 @@ namespace Nz bool Init(Nz::Window& window, bool bLoadDefaultFont = true); void Update(float dt); + void Render(); void Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame); inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; } diff --git a/src/NazaraImgui/ImguiDrawer.cpp b/src/NazaraImgui/ImguiDrawer.cpp index 5442e2f..69965ab 100644 --- a/src/NazaraImgui/ImguiDrawer.cpp +++ b/src/NazaraImgui/ImguiDrawer.cpp @@ -66,8 +66,6 @@ namespace Nz void ImguiDrawer::Prepare(RenderFrame& frame) { - Nz::Imgui::Instance()->RenderInternal(); - m_drawCalls.clear(); ImDrawData* drawData = ImGui::GetDrawData(); diff --git a/src/NazaraImgui/NazaraImgui.cpp b/src/NazaraImgui/NazaraImgui.cpp index aef2afe..d7bdb12 100644 --- a/src/NazaraImgui/NazaraImgui.cpp +++ b/src/NazaraImgui/NazaraImgui.cpp @@ -278,6 +278,7 @@ namespace Nz void Imgui::Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame) { + Render(); m_imguiDrawer.Prepare(frame); frame.Execute([this, renderTarget, &frame](Nz::CommandBufferBuilder& builder) { @@ -296,7 +297,7 @@ namespace Nz }, Nz::QueueType::Graphics); } - void Imgui::RenderInternal() + void Imgui::Render() { for (auto* handler : m_handlers) handler->OnRenderImgui();