Skip to content

Commit 1ebc43b

Browse files
committed
Re-enable editor (but now only the console shows up??)
1 parent f1c8220 commit 1ebc43b

File tree

4 files changed

+24
-3
lines changed

4 files changed

+24
-3
lines changed

Source/Mocha.Host/Rendering/Platform/Vulkan/vulkanrendercontext.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1047,6 +1047,8 @@ RenderStatus VulkanRenderContext::BeginImGui()
10471047
ImGui_ImplVulkan_NewFrame();
10481048
ImGui_ImplSDL2_NewFrame( m_window->GetSDLWindow() );
10491049

1050+
ImGui::NewFrame();
1051+
10501052
return RENDER_STATUS_OK;
10511053
}
10521054

Source/Mocha.Host/Rendering/rendermanager.cpp

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,12 @@ void SceneMeshPass::RenderMesh( RenderPushConstants constants, Mesh* mesh )
216216
{
217217
}
218218

219+
void EditorPass::Execute()
220+
{
221+
Globals::m_hostManager->Render();
222+
Globals::m_hostManager->DrawEditor();
223+
}
224+
219225
void RenderManager::Render()
220226
{
221227
// Server is headless - don't render
@@ -261,14 +267,21 @@ void RenderManager::Render()
261267
sceneMeshPass.AddMesh( mesh );
262268
} );
263269

270+
//
271+
// B. Editor pass
272+
//
273+
EditorPass editorPass{};
274+
264275
//
265276
// 2. Execute passes
266277
//
267278
Globals::m_renderContext->BeginRendering();
268279
sceneMeshPass.Execute();
269-
Globals::m_renderContext->EndRendering();
270280

271-
Globals::m_hostManager->Render();
281+
Globals::m_renderContext->BeginImGui();
282+
editorPass.Execute();
283+
Globals::m_renderContext->EndImGui();
284+
Globals::m_renderContext->EndRendering();
272285
}
273286

274287
void RenderPass::Execute()

Source/Mocha.Host/Rendering/rendermanager.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,10 @@ class RenderManager : ISubSystem
6161
void Shutdown();
6262

6363
void Render();
64+
};
65+
66+
class EditorPass : public RenderPass
67+
{
68+
public:
69+
void Execute() override;
6470
};

Source/Mocha.Hotload/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public static void DrawEditor()
208208
{
209209
// Render editor.
210210
SetServerContext( false );
211-
// s_editor.EntryPoint?.FrameUpdate();
211+
s_editor.EntryPoint?.FrameUpdate();
212212
}
213213

214214
/// <summary>

0 commit comments

Comments
 (0)