From 10cf82ee0616b31f5dc593d2cdb67937c193a1cd Mon Sep 17 00:00:00 2001
From: Antoine Pilote <antoinepilote1@hotmail.com>
Date: Mon, 7 Aug 2023 19:04:01 -0400
Subject: [PATCH] Merge conflict

---
 Editor/Runtime.cpp                    |  3 ++-
 Nuake/src/Rendering/SceneRenderer.cpp | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Editor/Runtime.cpp b/Editor/Runtime.cpp
index a716c275..97f5d50f 100644
--- a/Editor/Runtime.cpp
+++ b/Editor/Runtime.cpp
@@ -7,6 +7,7 @@
 #include <iostream>
 #include <string>
 
+/*
 void CheckError()
 {
     GLenum err;
@@ -38,4 +39,4 @@ void main(int argc, char* argv[])
         
         Nuake::Engine::EndDraw();
     }
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/Nuake/src/Rendering/SceneRenderer.cpp b/Nuake/src/Rendering/SceneRenderer.cpp
index d73bba18..5b7408c1 100644
--- a/Nuake/src/Rendering/SceneRenderer.cpp
+++ b/Nuake/src/Rendering/SceneRenderer.cpp
@@ -56,7 +56,14 @@ namespace Nuake
 		mShadingBuffer->QueueResize(framebuffer.GetSize());
 		ShadingPass(scene);
 
+		// SSAO
 		const auto& sceneEnv = scene.GetEnvironment();
+		sceneEnv->mSSAO->Resize(framebuffer.GetSize());
+		sceneEnv->mSSAO->Draw(mGBuffer.get(), mProjection, mView);
+
+		mShadingBuffer->QueueResize(framebuffer.GetSize());
+		ShadingPass(scene);
+
 		Ref<Texture> finalOutput = mShadingBuffer->GetTexture();
 		if (scene.GetEnvironment()->BloomEnabled)
 		{
@@ -112,9 +119,7 @@ namespace Nuake
 
 		finalOutput = framebuffer.GetTexture();
 
-		// SSAO
-		sceneEnv->mSSAO->Resize(framebuffer.GetSize());
-		sceneEnv->mSSAO->Draw(mGBuffer.get(), mProjection, mView);
+
 
 		// Copy final output to target framebuffer
 		mToneMapBuffer->QueueResize(framebuffer.GetSize());