celisej567/Nuake-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Transform system overhaul

Browse Source 
Fixed child rotations
Added editor overhauls
This commit is contained in:
antopilo
2021-09-05 16:43:38 -04:00
parent dda1db4794
commit a6823ba2fa
15 changed files with 407 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Nuake/src/Window.cpp
View File

@@ -266,24 +266,27 @@ namespace Nuake {
m_Scene->DrawShadows();
m_Framebuffer->Bind();
m_Framebuffer->Clear();
{
if (Engine::IsPlayMode)
m_Scene->Draw();
//else
// m_Scene->EditorDraw();
m_Scene->DrawInterface(m_Framebuffer->GetSize());
}
m_Framebuffer->Unbind();
//m_Framebuffer->Bind();
//m_Framebuffer->Clear();
//{
// if (Engine::IsPlayMode)
// m_Scene->Draw();
// //else
// // m_Scene->EditorDraw();
//
// m_Scene->DrawInterface(m_Framebuffer->GetSize());
//}
//m_Framebuffer->Unbind();
m_Scene->m_EditorCamera->OnWindowResize(m_GBuffer->GetSize().x, m_GBuffer->GetSize().y);
m_GBuffer->Bind();
m_GBuffer->Clear();
{
m_Scene->EditorDrawDeferred();
if (Engine::IsPlayMode)
m_Scene->DrawDeferred();
else
m_Scene->EditorDrawDeferred();
}
m_GBuffer->Unbind();
@@ -292,10 +295,11 @@ namespace Nuake {
m_DeferredBuffer->Clear();
{
glDisable(GL_CULL_FACE);
if (m_Scene->GetEnvironment()->ProceduralSkybox)
m_Scene->GetEnvironment()->ProceduralSkybox->Draw(m_Scene->m_EditorCamera);
m_Scene->EditorDrawDeferredShading();
if (Engine::IsPlayMode)
m_Scene->DrawDeferredShading();
else
m_Scene->EditorDrawDeferredShading();
m_GBuffer->GetTexture(GL_DEPTH_ATTACHMENT)->Bind(5);
m_GBuffer->GetTexture(GL_COLOR_ATTACHMENT0)->Bind(6);
@@ -309,8 +313,6 @@ namespace Nuake {
deferredShader->SetUniform1i("m_Material", 8);
Renderer::DrawQuad(Matrix4());
}
m_DeferredBuffer->Unbind();