From 40355ebfc2dffc568c3469ae7d489391646d7165 Mon Sep 17 00:00:00 2001 From: Light Date: Tue, 27 Jul 2021 11:32:01 +0430 Subject: [PATCH] Minor changes - Minor fixes - Minor maintenance --- Engine/src/Engine/Base.h | 2 +- Engine/src/Engine/Core/Application.cpp | 2 +- .../Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp | 2 +- .../Graphics/RendererPrograms/TextureRendererProgram.cpp | 2 +- Engine/src/Engine/Input/KeyCodes.h | 2 ++ Engine/src/Engine/Input/MouseCodes.h | 2 ++ Engine/src/Engine/Layer/LayerStack.h | 2 +- Engine/src/Engine/Scene/Entity.h | 4 ++-- Mirror/src/MirrorApp.cpp | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Engine/src/Engine/Base.h b/Engine/src/Engine/Base.h index b5b0037..7dadf86 100644 --- a/Engine/src/Engine/Base.h +++ b/Engine/src/Engine/Base.h @@ -17,7 +17,7 @@ namespace Light { template constexpr Ref MakeRef(T* rawPointer) { - return std::shared_ptr(T); + return std::shared_ptr(rawPointer); } // Scope (std::unique_ptr) diff --git a/Engine/src/Engine/Core/Application.cpp b/Engine/src/Engine/Core/Application.cpp index 19e5fa2..8944394 100644 --- a/Engine/src/Engine/Core/Application.cpp +++ b/Engine/src/Engine/Core/Application.cpp @@ -39,7 +39,7 @@ namespace Light { void Application::GameLoop() { // check - // LT_ENGINE_ASSERT(!m_LayerStack.IsEmpty(), "Application::GameLoop(pre): LayerStack is empty"); + LT_ENGINE_ASSERT(!m_LayerStack->IsEmpty(), "Application::GameLoop(pre): LayerStack is empty"); // log debug data LogDebugData(); diff --git a/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp b/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp index 7a59afa..c587e63 100644 --- a/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp +++ b/Engine/src/Engine/Graphics/RendererPrograms/QuadRendererProgram.cpp @@ -20,7 +20,7 @@ namespace Light { m_VertexBuffer = Ref(VertexBuffer::Create(nullptr, sizeof(QuadVertexData), maxVertices, sharedContext)); m_IndexBuffer = Ref(IndexBuffer::Create(nullptr, (maxVertices / 4) * 6, sharedContext)); m_VertexLayout = Ref(VertexLayout::Create(m_VertexBuffer, m_Shader, { { "POSITION", VertexElementType::Float3 }, - { "COLOR" , VertexElementType::Float4 }}, sharedContext)); + { "COLOR" , VertexElementType::Float4 }}, sharedContext)); } bool QuadRendererProgram::Advance() diff --git a/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp b/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp index 3c420d9..a57f859 100644 --- a/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp +++ b/Engine/src/Engine/Graphics/RendererPrograms/TextureRendererProgram.cpp @@ -20,7 +20,7 @@ namespace Light { m_VertexBuffer = Ref(VertexBuffer::Create(nullptr, sizeof(TextureVertexData), maxVertices, sharedContext)); m_IndexBuffer = Ref(IndexBuffer::Create(nullptr, (maxVertices / 4) * 6, sharedContext)); m_VertexLayout = Ref(VertexLayout::Create(m_VertexBuffer, m_Shader, { { "POSITION", VertexElementType::Float3 }, - { "TEXCOORD", VertexElementType::Float2 }}, sharedContext)); + { "TEXCOORD", VertexElementType::Float2 }}, sharedContext)); } bool TextureRendererProgram::Advance() diff --git a/Engine/src/Engine/Input/KeyCodes.h b/Engine/src/Engine/Input/KeyCodes.h index e1e9d01..773b751 100644 --- a/Engine/src/Engine/Input/KeyCodes.h +++ b/Engine/src/Engine/Input/KeyCodes.h @@ -1,5 +1,7 @@ #pragma once +#include "ltpch.h" + #include namespace Light { diff --git a/Engine/src/Engine/Input/MouseCodes.h b/Engine/src/Engine/Input/MouseCodes.h index dedbd28..115d048 100644 --- a/Engine/src/Engine/Input/MouseCodes.h +++ b/Engine/src/Engine/Input/MouseCodes.h @@ -1,5 +1,7 @@ #pragma once +#include "ltpch.h" + #include namespace Light { diff --git a/Engine/src/Engine/Layer/LayerStack.h b/Engine/src/Engine/Layer/LayerStack.h index 8a0d873..80c0bf3 100644 --- a/Engine/src/Engine/Layer/LayerStack.h +++ b/Engine/src/Engine/Layer/LayerStack.h @@ -24,7 +24,7 @@ namespace Light { // #todo: should we keep this? template - static inline void AttachLayer(Args&&... args) { s_Context->AttachLayerImpl(new T((args)...)); } + static inline void EmplaceLayer(Args&&... args) { s_Context->AttachLayerImpl(new T((args)...)); } static inline void AttachLayer(Layer* layer) { s_Context->AttachLayerImpl(layer); } static inline void DetachLayer(Layer* layer) { s_Context->DetachLayerImpl(layer); } diff --git a/Engine/src/Engine/Scene/Entity.h b/Engine/src/Engine/Scene/Entity.h index 161d004..efd13b1 100644 --- a/Engine/src/Engine/Scene/Entity.h +++ b/Engine/src/Engine/Scene/Entity.h @@ -2,12 +2,12 @@ #include "Base.h" +#include "Scene.h" + #include namespace Light { - class Scene; - class Entity { private: diff --git a/Mirror/src/MirrorApp.cpp b/Mirror/src/MirrorApp.cpp index b5e4767..60a8597 100644 --- a/Mirror/src/MirrorApp.cpp +++ b/Mirror/src/MirrorApp.cpp @@ -22,7 +22,7 @@ namespace Light { m_Window->SetProperties(properties); // Attach the sandbox layer - LayerStack::AttachLayer(("MirrorLayer")); + LayerStack::EmplaceLayer(("MirrorLayer")); } ~Mirror()