From dc3c993962a43cc645704e18696f7d814b0804d0 Mon Sep 17 00:00:00 2001
From: Antoine Pilote <antoinepilote1@hotmail.com>
Date: Wed, 4 Sep 2024 00:33:05 -0400
Subject: [PATCH] Refactor pass #3

---
 Editor/src/Windows/EditorInterface.cpp               | 8 ++++----
 Editor/src/Windows/NewProjectWindow.cpp              | 2 +-
 Editor/src/Windows/TrenchbroomConfiguratorWindow.cpp | 2 ++
 Editor/src/Windows/WelcomeWindow.cpp                 | 2 +-
 Nuake/src/Scene/SceneManager.cpp                     | 2 +-
 Nuake/src/Scene/SceneManager.h                       | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Editor/src/Windows/EditorInterface.cpp b/Editor/src/Windows/EditorInterface.cpp
index 58ce433d..3ff5c5c9 100644
--- a/Editor/src/Windows/EditorInterface.cpp
+++ b/Editor/src/Windows/EditorInterface.cpp
@@ -598,7 +598,7 @@ namespace Nuake {
                 {
                     Engine::ExitPlayMode();
 
-                    Engine::LoadScene(SceneSnapshot);
+                    Engine::SetCurrentScene(SceneSnapshot);
                     Selection = EditorSelection();
                     SetStatusMessage("Ready");
                 }
@@ -2640,7 +2640,7 @@ namespace Nuake {
         
         Ref<Project> project = Project::New(String::Split(fileName, '.')[0], "no description", finalPath);
         Engine::LoadProject(project);
-        Engine::LoadScene(Scene::New());
+        Engine::SetCurrentScene(Scene::New());
 
         Engine::GetCurrentWindow()->SetTitle("Nuake Engine - Editing " + project->Name); 
     }
@@ -2689,7 +2689,7 @@ namespace Nuake {
         }
 
         scene->Path = FileSystem::AbsoluteToRelative(projectPath);
-        Engine::LoadScene(scene);
+        Engine::SetCurrentScene(scene);
     }
 
     void EditorInterface::DrawMenuBar()
@@ -2735,7 +2735,7 @@ namespace Nuake {
                 ImGui::Separator();
                 if (ImGui::MenuItem("New scene"))
                 {
-                    Engine::LoadScene(Scene::New());
+                    Engine::SetCurrentScene(Scene::New());
                     Selection = EditorSelection();
                     SetStatusMessage("New scene created.");
                 }
diff --git a/Editor/src/Windows/NewProjectWindow.cpp b/Editor/src/Windows/NewProjectWindow.cpp
index 601ed421..ecee4b06 100644
--- a/Editor/src/Windows/NewProjectWindow.cpp
+++ b/Editor/src/Windows/NewProjectWindow.cpp
@@ -231,7 +231,7 @@ namespace Nuake
 							Nuake::FileSystem::SetRootDirectory(projectParentPath);
 							auto project = Nuake::Project::New(projectTitle, description, finalLocation);
 							Nuake::Engine::LoadProject(project);
-							Nuake::Engine::LoadScene(Nuake::Scene::New());
+							Nuake::Engine::SetCurrentScene(Nuake::Scene::New());
 							project->Settings.PrimaryColor = Nuake::Color(primaryColor.x, primaryColor.y, primaryColor.z, primaryColor.w);
 							project->Save();
 
diff --git a/Editor/src/Windows/TrenchbroomConfiguratorWindow.cpp b/Editor/src/Windows/TrenchbroomConfiguratorWindow.cpp
index d3c0d0fb..ece07ad9 100644
--- a/Editor/src/Windows/TrenchbroomConfiguratorWindow.cpp
+++ b/Editor/src/Windows/TrenchbroomConfiguratorWindow.cpp
@@ -1,11 +1,13 @@
 #include "TrenchbroomConfiguratorWindow.h"
 
 #include <Engine.h>
+#include <src/Resource/Project.h>
 #include <src/UI/ImUI.h>
 #include <src/Core/OS.h>
 #include <src/Rendering/Textures/TextureManager.h>
 #include <src/Resource/Prefab.h>
 
+
 void TrenchbroomConfiguratorWindow::Update()
 {
 
diff --git a/Editor/src/Windows/WelcomeWindow.cpp b/Editor/src/Windows/WelcomeWindow.cpp
index 7ef977fa..f7ad1360 100644
--- a/Editor/src/Windows/WelcomeWindow.cpp
+++ b/Editor/src/Windows/WelcomeWindow.cpp
@@ -309,7 +309,7 @@ namespace Nuake
 
 				//	auto project = Project::New(String::Split(fileName, '.')[0], "no description", finalPath);
 				//	Engine::LoadProject(project);
-				//	Engine::LoadScene(Scene::New());
+				//	Engine::SetCurrentScene(Scene::New());
 				//	project->Save();
 
 				//	auto projectPreview = ProjectPreview();
diff --git a/Nuake/src/Scene/SceneManager.cpp b/Nuake/src/Scene/SceneManager.cpp
index 30f3a644..7c086322 100644
--- a/Nuake/src/Scene/SceneManager.cpp
+++ b/Nuake/src/Scene/SceneManager.cpp
@@ -24,7 +24,7 @@ Ref<Scene> SceneManager::GetScene(const UUID& uuid) const
 	return Ref<Scene>();
 }
 
-Ref<Scene> SceneManager::LoadScene(Ref<File> file)
+Ref<Scene> SceneManager::SetCurrentScene(Ref<File> file)
 {
 
 	return Ref<Scene>();
diff --git a/Nuake/src/Scene/SceneManager.h b/Nuake/src/Scene/SceneManager.h
index 6a743a26..c5889186 100644
--- a/Nuake/src/Scene/SceneManager.h
+++ b/Nuake/src/Scene/SceneManager.h
@@ -19,7 +19,7 @@ namespace Nuake
 		bool IsSceneLoaded(const UUID& uuid) const;
 		Ref<Scene> GetScene(const UUID& uuid) const;
 
-		Ref<Scene> LoadScene(Ref<File> file);
+		Ref<Scene> SetCurrentScene(Ref<File> file);
 		void UnloadScene(const UUID& uuid);
 
 	private: