Re-enable editor (but now only the console shows up??)

mocha-engine · Dec 23, 2024 · 1ebc43b · 1ebc43b
1 parent f1c8220
commit 1ebc43b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/Source/Mocha.Host/Rendering/Platform/Vulkan/vulkanrendercontext.cpp b/Source/Mocha.Host/Rendering/Platform/Vulkan/vulkanrendercontext.cpp
@@ -1047,6 +1047,8 @@ RenderStatus VulkanRenderContext::BeginImGui()
 	ImGui_ImplVulkan_NewFrame();
 	ImGui_ImplSDL2_NewFrame( m_window->GetSDLWindow() );
 
+	ImGui::NewFrame();
+
 	return RENDER_STATUS_OK;
 }
 

diff --git a/Source/Mocha.Host/Rendering/rendermanager.cpp b/Source/Mocha.Host/Rendering/rendermanager.cpp
@@ -216,6 +216,12 @@ void SceneMeshPass::RenderMesh( RenderPushConstants constants, Mesh* mesh )
 {
 }
 
+void EditorPass::Execute()
+{
+	Globals::m_hostManager->Render();
+	Globals::m_hostManager->DrawEditor();
+}
+
 void RenderManager::Render()
 {
 	// Server is headless - don't render
@@ -261,14 +267,21 @@ void RenderManager::Render()
 			sceneMeshPass.AddMesh( mesh );
 	} );
 
+	//
+	// B. Editor pass
+	//
+	EditorPass editorPass{};
+
 	//
 	// 2. Execute passes
 	//
 	Globals::m_renderContext->BeginRendering();
 	sceneMeshPass.Execute();
-	Globals::m_renderContext->EndRendering();
 
-	Globals::m_hostManager->Render();
+	Globals::m_renderContext->BeginImGui();
+	editorPass.Execute();
+	Globals::m_renderContext->EndImGui();
+	Globals::m_renderContext->EndRendering();
 }
 
 void RenderPass::Execute()

diff --git a/Source/Mocha.Host/Rendering/rendermanager.h b/Source/Mocha.Host/Rendering/rendermanager.h
@@ -61,4 +61,10 @@ class RenderManager : ISubSystem
 	void Shutdown();
 
 	void Render();
+};
+
+class EditorPass : public RenderPass
+{
+public:
+	void Execute() override;
 };
diff --git a/Source/Mocha.Hotload/Main.cs b/Source/Mocha.Hotload/Main.cs
@@ -208,7 +208,7 @@ public static void DrawEditor()
 	{
 		// Render editor.
 		SetServerContext( false );
-		// s_editor.EntryPoint?.FrameUpdate();
+		s_editor.EntryPoint?.FrameUpdate();
 	}
 
 	/// <summary>