[add]: Custom memory managers and fix includes

2 files changed, 15 insertions, 15 deletions

diff --git a/src/States/SimulationState.cpp b/src/States/SimulationState.cpp
index 103fd0f..a37e527 100644
--- a/src/States/SimulationState.cpp
+++ b/src/States/SimulationState.cpp
@@ -6,7 +6,6 @@
 #include "Rendering/Shader.h"
 #include "Rendering/Texture.h"
 
-#include <iostream>
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <GLFW/glfw3.h>
@@ -15,7 +14,7 @@ namespace Donut
 {
     void SimulationState::OnEnter()
     {
-        m_Camera = std::make_unique<Camera>(45.0f, 1280.0f / 720.0f, 0.1f, 100.0f);
+        m_Camera = CreateScope<Camera>(45.0f, 1280.0f / 720.0f, 0.1f, 100.0f);
         m_Camera->SetPosition({ 0.0f, 0.0f, 3.0f });
         m_Camera->SetMouseSensitivity(0.1f);
         m_Camera->SetMovementSpeed(5.0f);
@@ -42,8 +41,8 @@ namespace Donut
             4, 5, 1,  1, 0, 4
         };
 
-        m_VertexArray = std::shared_ptr<VertexArray>(VertexArray::Create());
-        m_VertexBuffer = std::shared_ptr<VertexBuffer>(VertexBuffer::Create(vertices, sizeof(vertices)));
+        m_VertexArray = Ref<VertexArray>(VertexArray::Create());
+        m_VertexBuffer = Ref<VertexBuffer>(VertexBuffer::Create(vertices, sizeof(vertices)));
         
         VertexBufferLayout layout;
         layout.Push<float>(3);
@@ -53,10 +52,10 @@ namespace Donut
 
         m_VertexArray->AddVertexBuffer(m_VertexBuffer);
 
-        m_IndexBuffer = std::shared_ptr<IndexBuffer>(IndexBuffer::Create(indices, 36));
+        m_IndexBuffer = Ref<IndexBuffer>(IndexBuffer::Create(indices, 36));
         m_VertexArray->SetIndexBuffer(m_IndexBuffer);
 
-        m_Shader = std::shared_ptr<Shader>(Shader::Create("Assets/Textured.glsl"));
+        m_Shader = Ref<Shader>(Shader::Create("Assets/Textured.glsl"));
         m_Texture = Texture2D::Create(256, 256);
         
         uint32_t* pixelData = new uint32_t[256 * 256];
@@ -82,7 +81,7 @@ namespace Donut
         m_Texture->SetData(pixelData, 256 * 256 * 4);
         delete[] pixelData;
 
-        m_ComputeShader = std::shared_ptr<Shader>(Shader::Create("Assets/TextureProcessor.glsl"));
+        m_ComputeShader = Ref<Shader>(Shader::Create("Assets/TextureProcessor.glsl"));
         
         if (!m_ComputeShader)
         {
diff --git a/src/States/SimulationState.h b/src/States/SimulationState.h
index d2f0106..aa0b15b 100644
--- a/src/States/SimulationState.h
+++ b/src/States/SimulationState.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Core/Memory.h"
 #include "Core/State.h"
 #include "Core/Event.h"
 #include "Core/Camera.h"
@@ -28,16 +29,16 @@ namespace Donut
         void HandleKeyInput(float deltaTime);
         void UpdateTexture();
     private:
-        std::unique_ptr<Camera> m_Camera;
+        Scope<Camera> m_Camera;
         
-        std::shared_ptr<VertexArray>  m_VertexArray;
-        std::shared_ptr<VertexBuffer> m_VertexBuffer;
-        std::shared_ptr<IndexBuffer>  m_IndexBuffer;
-        std::shared_ptr<Shader>       m_Shader;
-        std::shared_ptr<Texture2D>    m_Texture;
+        Ref<VertexArray>  m_VertexArray;
+        Ref<VertexBuffer> m_VertexBuffer;
+        Ref<IndexBuffer>  m_IndexBuffer;
+        Ref<Shader>       m_Shader;
+        Ref<Texture2D>    m_Texture;
         
-        std::shared_ptr<Shader>    m_ComputeShader;
-        std::shared_ptr<Texture2D> m_ProcessedTexture;
+        Ref<Shader>    m_ComputeShader;
+        Ref<Texture2D> m_ProcessedTexture;
         
         float m_ComputeBrightness = 0.0f;
         float m_ComputeContrast   = 1.0f;