From 1b89eaa695e62a7f9ca9adeeb2467e2aa95d220f Mon Sep 17 00:00:00 2001 From: antopilo Date: Fri, 13 Sep 2024 17:26:21 -0400 Subject: [PATCH] Disabled UI rendering in camera previews --- Editor/src/Windows/EditorInterface.cpp | 2 +- Nuake/src/Rendering/SceneRenderer.cpp | 12 +++++++----- Nuake/src/Rendering/SceneRenderer.h | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp index 4201f29c..0aab3050 100644 --- a/Editor/src/Windows/EditorInterface.cpp +++ b/Editor/src/Windows/EditorInterface.cpp @@ -2695,7 +2695,7 @@ namespace Nuake { auto sceneRenderer = Engine::GetCurrentScene()->m_SceneRenderer; sceneRenderer->BeginRenderScene(cam->GetPerspective(), cam->GetTransform(), cam->Translation); - sceneRenderer->RenderScene(*Engine::GetCurrentScene().get(), *virtualCamera.get()); + sceneRenderer->RenderScene(*Engine::GetCurrentScene().get(), *virtualCamera.get(), false); virtualCamera->Clear(); ImGui::Image((void*)virtualCamera->GetTexture()->GetID(), { 640, 360 }, { 0, 1 }, {1, 0}); diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp index f5192939..d66c03f3 100644 --- a/Nuake/src/Rendering/SceneRenderer.cpp +++ b/Nuake/src/Rendering/SceneRenderer.cpp @@ -139,7 +139,7 @@ namespace Nuake /// /// Scene to render /// Framebuffer to render the scene to. Should be in the right size - void SceneRenderer::RenderScene(Scene& scene, FrameBuffer& framebuffer) + void SceneRenderer::RenderScene(Scene& scene, FrameBuffer& framebuffer, bool renderUI) { ZoneScoped; @@ -179,8 +179,10 @@ namespace Nuake ); // World Space UI - - DebugRendererPass(scene); + if (renderUI) + { + DebugRendererPass(scene); + } Ref finalOutput = mShadingBuffer->GetTexture(); if (scene.GetEnvironment()->BloomEnabled) @@ -291,7 +293,7 @@ namespace Nuake } mToneMapBuffer->Unbind(); - if (sceneEnv->SSREnabled) + if (sceneEnv->SSREnabled && renderUI) { sceneEnv->mSSR->Resize(framebufferResolution); sceneEnv->mSSR->Draw(mGBuffer.get(), framebuffer.GetTexture(), mView, mProjection, scene.GetCurrentCamera()); @@ -449,7 +451,7 @@ namespace Nuake continue; } - if (!uiComponent.IsWorldSpace) + if (!uiComponent.IsWorldSpace && renderUI) { // Fetch resource from resource manager using UUID Ref uiResource = ResourceManager::GetResource(uiComponent.UIResource); diff --git a/Nuake/src/Rendering/SceneRenderer.h b/Nuake/src/Rendering/SceneRenderer.h index 8334aaa7..27215bbe 100644 --- a/Nuake/src/Rendering/SceneRenderer.h +++ b/Nuake/src/Rendering/SceneRenderer.h @@ -54,7 +54,7 @@ namespace Nuake void Update(const Timestep time, bool isEditorUpdate = false); void BeginRenderScene(const Matrix4& projection, const Matrix4& view, const Vector3& camPos); - void RenderScene(Scene& scene, FrameBuffer& framebuffer); + void RenderScene(Scene& scene, FrameBuffer& framebuffer, bool renderUI = true); FrameBuffer& GetGBuffer() const {