celisej567/Nuake
1
0
Fork 0
mirror of https://github.com/antopilo/Nuake.git synced 2026-09-09 20:08:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
Antoine Pilote
2023-08-07 19:04:01 -04:00
parent a5ee88cb8e
commit 10cf82ee06
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Editor/Runtime.cpp
View File

@@ -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();
}
}
}*/

11
Nuake/src/Rendering/SceneRenderer.cpp
View File

@@ -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());