From d2bd0881d1497e19473e01802d74b6315b46beed Mon Sep 17 00:00:00 2001 From: Light3039 Date: Wed, 14 Jul 2021 02:19:52 +0430 Subject: [PATCH] Linux fix - Fixed 'Instrumentor' by including 'ostream' & 'fstream' - Fixed 'Application' by including 'Instrumentor' - Fixed both 'RendererProgram''s 'Advance()', should have returned true --- Engine/src/Engine/Core/Application.h | 2 ++ Engine/src/Engine/Debug/Instrumentor.h | 3 +++ Engine/src/Engine/Graphics/Renderer.cpp | 5 ++--- .../Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp | 1 + .../Graphics/RendererPrograms/TextureRendererProgram.cpp | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Engine/src/Engine/Core/Application.h b/Engine/src/Engine/Core/Application.h index 478af72..a29c12c 100644 --- a/Engine/src/Engine/Core/Application.h +++ b/Engine/src/Engine/Core/Application.h @@ -2,6 +2,8 @@ #include "Base.h" +#include "Debug/Instrumentor.h" + #include "Layer/LayerStack.h" namespace Light { diff --git a/Engine/src/Engine/Debug/Instrumentor.h b/Engine/src/Engine/Debug/Instrumentor.h index 04416e0..30a95d7 100644 --- a/Engine/src/Engine/Debug/Instrumentor.h +++ b/Engine/src/Engine/Debug/Instrumentor.h @@ -2,6 +2,9 @@ #include "Base.h" +#include +#include + #include namespace Light { diff --git a/Engine/src/Engine/Graphics/Renderer.cpp b/Engine/src/Engine/Graphics/Renderer.cpp index b3047a9..319d3a5 100644 --- a/Engine/src/Engine/Graphics/Renderer.cpp +++ b/Engine/src/Engine/Graphics/Renderer.cpp @@ -120,6 +120,8 @@ namespace Light { void Renderer::EndFrame() { + m_RenderCommand->SwapBuffers(); + m_RenderCommand->ClearBackBuffer(); } void Renderer::BeginSceneImpl(const std::shared_ptr& camera) @@ -158,9 +160,6 @@ namespace Light { m_TextureRenderer.Bind(); m_RenderCommand->DrawIndexed(m_TextureRenderer.GetQuadCount() * 6u); } - - m_RenderCommand->SwapBuffers(); - m_RenderCommand->ClearBackBuffer(); } } \ No newline at end of file diff --git a/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp b/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp index 2b58a28..302e383 100644 --- a/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp +++ b/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp @@ -33,6 +33,7 @@ namespace Light { m_MapCurrent += 4; m_QuadCount++; + return true; } void QuadRendererProgram::SetCamera(const Camera& camera) diff --git a/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp b/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp index 46f06e9..6de25ca 100644 --- a/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp +++ b/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp @@ -33,6 +33,7 @@ namespace Light { m_MapCurrent += 4; m_QuadCount++; + return true; } void TextureRendererProgram::SetCamera(const Camera& camera)