renaming RenderInternal to Render. Drawer no longer call RenderInternal
This commit is contained in:
parent
1a74784143
commit
e2aa7cb65c
|
|
@ -36,6 +36,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(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; }
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,6 @@ namespace Nz
|
||||||
|
|
||||||
void ImguiDrawer::Prepare(RenderFrame& frame)
|
void ImguiDrawer::Prepare(RenderFrame& frame)
|
||||||
{
|
{
|
||||||
Nz::Imgui::Instance()->RenderInternal();
|
|
||||||
|
|
||||||
m_drawCalls.clear();
|
m_drawCalls.clear();
|
||||||
|
|
||||||
ImDrawData* drawData = ImGui::GetDrawData();
|
ImDrawData* drawData = ImGui::GetDrawData();
|
||||||
|
|
|
||||||
|
|
@ -278,6 +278,7 @@ namespace Nz
|
||||||
|
|
||||||
void Imgui::Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame)
|
void Imgui::Render(Nz::RenderTarget* renderTarget, Nz::RenderFrame& frame)
|
||||||
{
|
{
|
||||||
|
Render();
|
||||||
m_imguiDrawer.Prepare(frame);
|
m_imguiDrawer.Prepare(frame);
|
||||||
|
|
||||||
frame.Execute([this, renderTarget, &frame](Nz::CommandBufferBuilder& builder) {
|
frame.Execute([this, renderTarget, &frame](Nz::CommandBufferBuilder& builder) {
|
||||||
|
|
@ -296,7 +297,7 @@ namespace Nz
|
||||||
}, Nz::QueueType::Graphics);
|
}, Nz::QueueType::Graphics);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Imgui::RenderInternal()
|
void Imgui::Render()
|
||||||
{
|
{
|
||||||
for (auto* handler : m_handlers)
|
for (auto* handler : m_handlers)
|
||||||
handler->OnRenderImgui();
|
handler->OnRenderImgui();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue