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

renaming RenderFrame to RenderResources

Browse Source
This commit is contained in:
SweetId
2023-11-22 11:27:24 +05:30
parent e72f1278c6
commit 41c6439b90
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/NazaraImgui/ImguiDrawer.hpp
View File

@@ -11,7 +11,7 @@ namespace Nz
class CommandBufferBuilder; class CommandBufferBuilder;
class RenderBuffer; class RenderBuffer;
class RenderDevice; class RenderDevice;
class RenderFrame; class RenderResources;
class RenderPipeline; class RenderPipeline;
class NAZARA_IMGUI_API ImguiDrawer class NAZARA_IMGUI_API ImguiDrawer
@@ -25,9 +25,9 @@ namespace Nz
ImguiDrawer& operator=(const ImguiDrawer&) = delete; ImguiDrawer& operator=(const ImguiDrawer&) = delete;
ImguiDrawer& operator=(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); void Draw(CommandBufferBuilder& builder);

2
include/NazaraImgui/NazaraImgui.hpp
View File

@@ -39,7 +39,7 @@ namespace Nz
bool Init(Nz::Window& window, bool bLoadDefaultFont = true); bool Init(Nz::Window& window, bool bLoadDefaultFont = true);
void Update(float dt); void Update(float dt);
void Render(); 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 ImguiDrawer& GetImguiDrawer() { return m_imguiDrawer; }
inline const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; } inline const ImguiDrawer& GetImguiDrawer() const { return m_imguiDrawer; }

4
src/NazaraImgui/ImguiDrawer.cpp
View File

@@ -64,7 +64,7 @@ namespace Nz
m_texturedPipeline.pipeline.reset(); m_texturedPipeline.pipeline.reset();
} }
void ImguiDrawer::Prepare(RenderFrame& frame) void ImguiDrawer::Prepare(RenderResources& frame)
{ {
m_drawCalls.clear(); m_drawCalls.clear();
@@ -191,7 +191,7 @@ namespace Nz
} }
} }
void ImguiDrawer::Reset(RenderFrame& renderFrame) void ImguiDrawer::Reset(RenderResources& renderFrame)
{ {
m_drawCalls.clear(); m_drawCalls.clear();
} }

2
src/NazaraImgui/ImguiPipelinePass.cpp
View File

@@ -16,7 +16,7 @@ namespace Nz
void ImguiPipelinePass::Prepare(FrameData& frameData) void ImguiPipelinePass::Prepare(FrameData& frameData)
{ {
ImguiDrawer& imguiDrawer = Nz::Imgui::Instance()->GetImguiDrawer(); ImguiDrawer& imguiDrawer = Nz::Imgui::Instance()->GetImguiDrawer();
imguiDrawer.Prepare(frameData.renderFrame); imguiDrawer.Prepare(frameData.renderResources);
} }
FramePass& ImguiPipelinePass::RegisterToFrameGraph(FrameGraph& frameGraph, const PassInputOuputs& inputOuputs) FramePass& ImguiPipelinePass::RegisterToFrameGraph(FrameGraph& frameGraph, const PassInputOuputs& inputOuputs)

4
src/NazaraImgui/NazaraImgui.cpp
View File

@@ -275,7 +275,7 @@ namespace Nz
ImGui::NewFrame(); ImGui::NewFrame();
} }
void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderFrame& frame) void Imgui::Render(Nz::Swapchain* renderTarget, Nz::RenderResources& frame)
{ {
Render(); Render();
m_imguiDrawer.Prepare(frame); m_imguiDrawer.Prepare(frame);
@@ -288,7 +288,7 @@ namespace Nz
Nz::Recti renderRect(0, 0, fb_width, fb_height); Nz::Recti renderRect(0, 0, fb_width, fb_height);
builder.BeginDebugRegion("ImGui", Nz::Color::Green()); 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); m_imguiDrawer.Draw(builder);
builder.EndRenderPass(); builder.EndRenderPass();
builder.EndDebugRegion(); builder.EndDebugRegion();