From c6f003b0c0da4ba9bd6c826915449bf8c1ad4144 Mon Sep 17 00:00:00 2001
From: Antoine Pilote <antoinepilote1@hotmail.com>
Date: Sun, 25 Sep 2022 14:45:04 -0400
Subject: [PATCH] Edited premake

---
 Editor/Editor.cpp | 7 +++++--
 premake5.lua      | 9 ++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp
index e59be092..b8a8037b 100644
--- a/Editor/Editor.cpp
+++ b/Editor/Editor.cpp
@@ -53,7 +53,8 @@ int main(int argc, char* argv[])
     if (playMode)
     {
         Nuake::Engine::Init();
-        Ref<Nuake::Window> window = Nuake::Engine::GetCurrentWindow();
+        Nuake::EditorInterface editor;
+        editor.BuildFonts();
 
         Ref<Nuake::Project> project = Nuake::Project::New();
         FileSystem::SetRootDirectory(projectPath + "/../");
@@ -61,6 +62,7 @@ int main(int argc, char* argv[])
         project->FullPath = projectPath;
         project->Deserialize(FileSystem::ReadFile(projectPath, true));
 
+        Ref<Nuake::Window> window = Nuake::Engine::GetCurrentWindow();
         window->SetTitle(project->Name);
 
         Nuake::Engine::LoadProject(project);
@@ -71,8 +73,10 @@ int main(int argc, char* argv[])
         {
             Nuake::Vector2 WindowSize = window->GetSize();
             glViewport(0, 0, WindowSize.x, WindowSize.y);
+            Nuake::Renderer2D::BeginDraw(WindowSize);
             Nuake::Engine::Tick();
             Nuake::Engine::Draw();
+
             shader->Bind();
 
             window->GetFrameBuffer()->GetTexture()->Bind(0);
@@ -123,7 +127,6 @@ int main(int argc, char* argv[])
 
             editor.Draw();
 
-            // Swap buffers.
             Nuake::Engine::EndDraw();
         }
     }
diff --git a/premake5.lua b/premake5.lua
index f4e7778b..25b20868 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -12,6 +12,7 @@ outputdir = "%{cfg.buildcfg}-%{cfg.system}-%{cfg.architecture}"
 include "Nuake/dependencies/glfw_p5.lua"
 include "Nuake/dependencies/assimp_p5.lua"
 include "Nuake/dependencies/freetype_p5.lua"
+include "Nuake/dependencies/jolt_p5.lua"
 
 project "Nuake"
     location "Nuake"
@@ -54,7 +55,7 @@ project "Nuake"
         "%{prj.name}/../Nuake/Dependencies/GLEW/include",
         "%{prj.name}/../Nuake/Dependencies/GLFW/include",
         "%{prj.name}/../Nuake/Dependencies/assimp/include",
-        "%{prj.name}/../Nuake/Dependencies/build",
+        "%{prj.name}/../Nuake/Dependencies/JoltPhysics/Jolt",
         "%{prj.name}/../Nuake/src/Vendors/msdfgen/include",
         "%{prj.name}/../Nuake/src/Vendors/msdfgen/freetype/include",
         "%{prj.name}/../Nuake/src/Vendors/msdfgen",
@@ -101,7 +102,8 @@ project "Editor"
         "%{prj.name}/../Nuake/Dependencies/GLFW/include",
         "%{prj.name}/../Nuake/Dependencies/assimp/include",
         "%{prj.name}/../Nuake/Dependencies/build",
-        "%{prj.name}/../Nuake/src/Vendors/msdfgen"
+        "%{prj.name}/../Nuake/src/Vendors/msdfgen",
+		"%{prj.name}/../Nuake/Dependencies/JoltPhysics/Jolt"
     }
     
     libdirs 
@@ -123,7 +125,8 @@ project "Editor"
         "assimp",
         "glew32s.lib", 
         "opengl32.lib",
-		"Freetype"
+		"Freetype",
+		"JoltPhysics",
     }
 
     filter "system:windows"