From 41c6439b90a6b989a402c2c12e5d06b645086c85 Mon Sep 17 00:00:00 2001 From: SweetId <2630750+SweetId@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:27:24 +0530 Subject: [PATCH] renaming RenderFrame to RenderResources --- include/NazaraImgui/ImguiDrawer.hpp | 6 +++--- include/NazaraImgui/NazaraImgui.hpp | 2 +- src/NazaraImgui/ImguiDrawer.cpp | 4 ++-- src/NazaraImgui/ImguiPipelinePass.cpp | 2 +- src/NazaraImgui/NazaraImgui.cpp | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/NazaraImgui/ImguiDrawer.hpp b/include/NazaraImgui/ImguiDrawer.hpp index 21473cd..c458e9c 100644 --- a/include/NazaraImgui/ImguiDrawer.hpp +++ b/include/NazaraImgui/ImguiDrawer.hpp @@ -11,7 +11,7 @@ namespace Nz class CommandBufferBuilder; class RenderBuffer; class RenderDevice; - class RenderFrame; + class RenderResources; class RenderPipeline; class NAZARA_IMGUI_API ImguiDrawer @@ -25,9 +25,9 @@ namespace Nz ImguiDrawer& operator=(const ImguiDrawer&) = delete; ImguiDrawer& operator=(ImguiDrawer&&) = delete; - void Prepare(RenderFrame& renderFrame); + void Prepare(RenderResources& renderFrame); - void Reset(RenderFrame& renderFrame); + void Reset(RenderResources& renderFrame); void Draw(CommandBufferBuilder& builder); diff --git a/include/NazaraImgui/NazaraImgui.hpp b/include/NazaraImgui/NazaraImgui.hpp index a27dab5..264c591 100644 --- a/include/NazaraImgui/NazaraImgui.hpp +++ b/include/NazaraImgui/NazaraImgui.hpp @@ -39,7 +39,7 @@ namespace Nz bool Init(Nz::Window& window, bool bLoadDefaultFont = true); void Update(float dt); void Render(); - void Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame); + void Render(Nz::Swapchain* renderTarget, Nz::RenderResources& frame); inline ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; } inline const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; } diff --git a/src/NazaraImgui/ImguiDrawer.cpp b/src/NazaraImgui/ImguiDrawer.cpp index 69965ab..2c35e85 100644 --- a/src/NazaraImgui/ImguiDrawer.cpp +++ b/src/NazaraImgui/ImguiDrawer.cpp @@ -64,7 +64,7 @@ namespace Nz m_texturedPipeline.pipeline.reset(); } - void ImguiDrawer::Prepare(RenderFrame& frame) + void ImguiDrawer::Prepare(RenderResources& frame) { m_drawCalls.clear(); @@ -191,7 +191,7 @@ namespace Nz } } - void ImguiDrawer::Reset(RenderFrame& renderFrame) + void ImguiDrawer::Reset(RenderResources& renderFrame) { m_drawCalls.clear(); } diff --git a/src/NazaraImgui/ImguiPipelinePass.cpp b/src/NazaraImgui/ImguiPipelinePass.cpp index 43b5404..68e13cb 100644 --- a/src/NazaraImgui/ImguiPipelinePass.cpp +++ b/src/NazaraImgui/ImguiPipelinePass.cpp @@ -16,7 +16,7 @@ namespace Nz void ImguiPipelinePass::Prepare(FrameData& frameData) { ImguiDrawer& imguiDrawer = Nz::Imgui::Instance()->GetImguiDrawer(); - imguiDrawer.Prepare(frameData.renderFrame); + imguiDrawer.Prepare(frameData.renderResources); } FramePass& ImguiPipelinePass::RegisterToFrameGraph(FrameGraph& frameGraph, const PassInputOuputs& inputOuputs) diff --git a/src/NazaraImgui/NazaraImgui.cpp b/src/NazaraImgui/NazaraImgui.cpp index b62451a..ecbe935 100644 --- a/src/NazaraImgui/NazaraImgui.cpp +++ b/src/NazaraImgui/NazaraImgui.cpp @@ -275,7 +275,7 @@ namespace Nz ImGui::NewFrame(); } - void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame) + void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderResources& frame) { Render(); m_imguiDrawer.Prepare(frame); @@ -288,7 +288,7 @@ namespace Nz Nz::Recti renderRect(0, 0, fb_width, fb_height); builder.BeginDebugRegion("ImGui", Nz::Color::Green()); - builder.BeginRenderPass(renderTarget->GetFramebuffer(frame.GetFramebufferIndex()), renderTarget->GetRenderPass(), renderRect); + builder.BeginRenderPass(renderTarget->GetFramebuffer(frame.GetImageIndex()), renderTarget->GetRenderPass(), renderRect); m_imguiDrawer.Draw(builder); builder.EndRenderPass(); builder.EndDebugRegion();