Fixed invalid default scene when created through the asset browser (#369)

adriengivry · web-flow · commit 4a8356c3cb7f · 2025-02-14T19:56:30.000-08:00
diff --git a/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h b/Sources/Overload/OvCore/include/OvCore/SceneSystem/Scene.h
@@ -45,6 +45,16 @@ namespace OvCore::SceneSystem
 		*/
 		~Scene();
 
+		/**
+		* Add a default camera to the scene
+		*/
+		void AddDefaultCamera();
+
+		/**
+		* Add default lights to the scene
+		*/
+		void AddDefaultLights();
+
 		/**
 		* Play the scene
 		*/
diff --git a/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h b/Sources/Overload/OvCore/include/OvCore/SceneSystem/SceneManager.h
@@ -48,9 +48,9 @@ namespace OvCore::SceneSystem
 		void LoadEmptyScene();
 
 		/**
-		* Load an empty lighted scene in memory
+		* Load a default scene in memory
 		*/
-		void LoadEmptyLightedScene();
+		void LoadDefaultScene();
 
 		/**
 		* Load specific scene in memory
@@ -108,7 +108,7 @@ namespace OvCore::SceneSystem
 
 	private:
 		const std::string m_sceneRootFolder;
-		Scene* m_currentScene = nullptr;
+		std::unique_ptr<Scene> m_currentScene = nullptr;
 
 		bool m_currentSceneLoadedFromPath = false;
 		std::string m_currentSceneSourcePath = "";
diff --git a/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp b/Sources/Overload/OvCore/src/OvCore/SceneSystem/Scene.cpp
@@ -7,7 +7,9 @@
 #include <algorithm>
 #include <string>
 
-#include "OvCore/SceneSystem/Scene.h"
+#include <OvCore/SceneSystem/Scene.h>
+#include <OvCore/ECS/Components/CDirectionalLight.h>
+#include <OvCore/ECS/Components/CAmbientSphereLight.h>
 
 OvCore::SceneSystem::Scene::Scene()
 {
@@ -24,6 +26,25 @@ OvCore::SceneSystem::Scene::~Scene()
 	m_actors.clear();
 }
 
+void OvCore::SceneSystem::Scene::AddDefaultCamera()
+{
+	auto& camera = CreateActor("Main Camera");
+	camera.AddComponent<ECS::Components::CCamera>();
+	camera.transform.SetLocalPosition({ 0.0f, 3.0f, 8.0f });
+	camera.transform.SetLocalRotation(OvMaths::FQuaternion({ 20.0f, 180.0f, 0.0f }));
+}
+
+void OvCore::SceneSystem::Scene::AddDefaultLights()
+{
+	auto& directionalLight = CreateActor("Directional Light");
+	directionalLight.AddComponent<ECS::Components::CDirectionalLight>().SetIntensity(0.75f);
+	directionalLight.transform.SetLocalPosition({ 0.0f, 10.0f, 0.0f });
+	directionalLight.transform.SetLocalRotation(OvMaths::FQuaternion({ 120.0f, -40.0f, 0.0f }));
+
+	auto& ambientLight = CreateActor("Ambient Light");
+	ambientLight.AddComponent<ECS::Components::CAmbientSphereLight>().SetRadius(10000.0f);
+}
+
 void OvCore::SceneSystem::Scene::Play()
 {
 	m_isPlaying = true;
diff --git a/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp b/Sources/Overload/OvCore/src/OvCore/SceneSystem/SceneManager.cpp
@@ -45,32 +45,17 @@ void OvCore::SceneSystem::SceneManager::LoadAndPlayDelayed(const std::string& p_
 void OvCore::SceneSystem::SceneManager::LoadEmptyScene()
 {
 	UnloadCurrentScene();
-
-	m_currentScene = new Scene();
-
+	m_currentScene.reset(new Scene());
 	SceneLoadEvent.Invoke();
 }
 
-void OvCore::SceneSystem::SceneManager::LoadEmptyLightedScene()
+void OvCore::SceneSystem::SceneManager::LoadDefaultScene()
 {
 	UnloadCurrentScene();
-
-	m_currentScene = new Scene();
-
+	m_currentScene.reset(new Scene());
+	m_currentScene->AddDefaultCamera();
+	m_currentScene->AddDefaultLights();
 	SceneLoadEvent.Invoke();
-
-	auto& directionalLight = m_currentScene->CreateActor("Directional Light");
-	directionalLight.AddComponent<ECS::Components::CDirectionalLight>().SetIntensity(0.75f);
-	directionalLight.transform.SetLocalPosition({ 0.0f, 10.0f, 0.0f });
-	directionalLight.transform.SetLocalRotation(OvMaths::FQuaternion({ 120.0f, -40.0f, 0.0f }));
-
-	auto& ambientLight = m_currentScene->CreateActor("Ambient Light");
-	ambientLight.AddComponent<ECS::Components::CAmbientSphereLight>().SetRadius(10000.0f);
-
-	auto& camera = m_currentScene->CreateActor("Main Camera");
-	camera.AddComponent<ECS::Components::CCamera>();
-	camera.transform.SetLocalPosition({ 0.0f, 3.0f, 8.0f });
-	camera.transform.SetLocalRotation(OvMaths::FQuaternion({ 20.0f, 180.0f, 0.0f }));
 }
 
 bool OvCore::SceneSystem::SceneManager::LoadScene(const std::string& p_path, bool p_absolute)
@@ -114,8 +99,7 @@ void OvCore::SceneSystem::SceneManager::UnloadCurrentScene()
 {
 	if (m_currentScene)
 	{
-		delete m_currentScene;
-		m_currentScene = nullptr;
+		m_currentScene.release();
 		SceneUnloadEvent.Invoke();
 	}
 
@@ -124,12 +108,12 @@ void OvCore::SceneSystem::SceneManager::UnloadCurrentScene()
 
 bool OvCore::SceneSystem::SceneManager::HasCurrentScene() const
 {
-	return m_currentScene;
+	return m_currentScene != nullptr;
 }
 
 OvCore::SceneSystem::Scene* OvCore::SceneSystem::SceneManager::GetCurrentScene() const
 {
-	return m_currentScene;
+	return m_currentScene.get();
 }
 
 std::string OvCore::SceneSystem::SceneManager::GetCurrentSceneSourcePath() const
diff --git a/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h b/Sources/Overload/OvEditor/include/OvEditor/Core/EditorActions.h
@@ -303,9 +303,10 @@ namespace OvEditor::Core
 
 		/**
 		* Save the current scene to the given path
+		* @param p_sceneToSave
 		* @param p_path
 		*/
-		void SaveCurrentSceneTo(const std::string& p_path);
+		void SaveSceneToDisk(OvCore::SceneSystem::Scene& p_scene, const std::string& p_path);
 
 		/**
 		* Load a scene from the disk
diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/Editor.cpp
@@ -38,7 +38,7 @@ OvEditor::Core::Editor::Editor(Context& p_context) :
 	Settings::EditorSettings::Load();
 	SetupUI();
 
-	m_context.sceneManager.LoadEmptyLightedScene();
+	m_context.sceneManager.LoadDefaultScene();
 }
 
 OvEditor::Core::Editor::~Editor()
diff --git a/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp b/Sources/Overload/OvEditor/src/OvEditor/Core/EditorActions.cpp
@@ -51,17 +51,21 @@ void OvEditor::Core::EditorActions::LoadEmptyScene()
 	if (GetCurrentEditorMode() != EEditorMode::EDIT)
 		StopPlaying();
 
-	m_context.sceneManager.LoadEmptyLightedScene();
+	m_context.sceneManager.LoadEmptyScene();
+	auto scene = m_context.sceneManager.GetCurrentScene();
+	scene->AddDefaultCamera();
+	scene->AddDefaultLights();
+
 	OVLOG_INFO("New scene created");
 }
 
-void OvEditor::Core::EditorActions::SaveCurrentSceneTo(const std::string& p_path)
+void OvEditor::Core::EditorActions::SaveSceneToDisk(OvCore::SceneSystem::Scene& p_scene, const std::string& p_path)
 {
 	tinyxml2::XMLDocument doc;
 	tinyxml2::XMLNode* node = doc.NewElement("root");
 	doc.InsertFirstChild(node);
 	m_context.sceneManager.StoreCurrentSceneSourcePath(p_path);
-	m_context.sceneManager.GetCurrentScene()->OnSerialize(doc, node);
+	p_scene.OnSerialize(doc, node);
 	doc.SaveFile(p_path.c_str());
 }
 
@@ -84,8 +88,12 @@ void OvEditor::Core::EditorActions::SaveSceneChanges()
 {
 	if (IsCurrentSceneLoadedFromDisk())
 	{
-		SaveCurrentSceneTo(m_context.sceneManager.GetCurrentSceneSourcePath());
-		OVLOG_INFO("Current scene saved to: " + m_context.sceneManager.GetCurrentSceneSourcePath());
+		auto currentScene = m_context.sceneManager.GetCurrentScene();
+		OVASSERT(currentScene, "Current scene is null");
+
+		const std::string currentScenePath = m_context.sceneManager.GetCurrentSceneSourcePath();
+		SaveSceneToDisk(*currentScene, currentScenePath);
+		OVLOG_INFO("Current scene saved to: " + currentScenePath);
 	}
 	else
 	{
@@ -112,7 +120,8 @@ void OvEditor::Core::EditorActions::SaveAs()
 			}
 		}
 
-		SaveCurrentSceneTo(dialog.GetSelectedFilePath());
+		auto currentScene = m_context.sceneManager.GetCurrentScene();
+		SaveSceneToDisk(*currentScene, dialog.GetSelectedFilePath());
 		OVLOG_INFO("Current scene saved to: " + dialog.GetSelectedFilePath());
 	}
 }
diff --git a/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp b/Sources/Overload/OvEditor/src/OvEditor/Panels/AssetBrowser.cpp
@@ -279,8 +279,11 @@ class FolderContextualMenu : public BrowserItemContextualMenu
 					++fails;
 				} while (std::filesystem::exists(finalPath));
 
-				std::ofstream outfile(finalPath);
-				outfile << "<root><scene><actors><actor><name>Directional Light</name><tag></tag><active>true</active><id>1</id><parent>0</parent><components><component><type>class OvCore::ECS::Components::CDirectionalLight</type><data><diffuse><x>1</x><y>1</y><z>1</z></diffuse><specular><x>1</x><y>1</y><z>1</z></specular><intensity>0.75</intensity></data></component><component><type>class OvCore::ECS::Components::CTransform</type><data><position><x>0</x><y>10</y><z>0</z></position><rotation><x>0.81379771</x><y>-0.17101006</y><z>0.29619816</z><w>0.46984628</w></rotation><scale><x>1</x><y>1</y><z>1</z></scale></data></component></components><behaviours/></actor><actor><name>Ambient Light</name><tag></tag><active>true</active><id>2</id><parent>0</parent><components><component><type>class OvCore::ECS::Components::CAmbientSphereLight</type><data><ambient><x>1</x><y>1</y><z>1</z></ambient><intensity>0.1</intensity><radius>10000</radius></data></component><component><type>class OvCore::ECS::Components::CTransform</type><data><position><x>0</x><y>0</y><z>0</z></position><rotation><x>0</x><y>0</y><z>0</z><w>1</w></rotation><scale><x>1</x><y>1</y><z>1</z></scale></data></component></components><behaviours/></actor><actor><name>Main Camera</name><tag></tag><active>true</active><id>3</id><parent>0</parent><components><component><type>class OvCore::ECS::Components::CCamera</type><data><fov>45</fov><near>0.1</near><far>1000</far><clear_color><x>0.1921569</x><y>0.3019608</y><z>0.47450981</z></clear_color></data></component><component><type>class OvCore::ECS::Components::CTransform</type><data><position><x>0</x><y>3</y><z>8</z></position><rotation><x>-7.5904039e-09</x><y>0.98480773</y><z>-0.17364819</z><w>-4.3047311e-08</w></rotation><scale><x>1</x><y>1</y><z>1</z></scale></data></component></components><behaviours/></actor></actors></scene></root>" << std::endl; // Empty scene content
+				auto emptyScene = OvCore::SceneSystem::Scene{};
+				emptyScene.AddDefaultCamera();
+				emptyScene.AddDefaultLights();
+
+				EDITOR_EXEC(SaveSceneToDisk(emptyScene, finalPath));
 
 				ItemAddedEvent.Invoke(finalPath);
 				Close();

Original file line number	Diff line number	Diff line change
`@@ -45,32 +45,17 @@ void OvCore::SceneSystem::SceneManager::LoadAndPlayDelayed(const std::string& p_`
`45`	`45`	`void OvCore::SceneSystem::SceneManager::LoadEmptyScene()`
`46`	`46`	`{`
`47`	`47`	`UnloadCurrentScene();`
`48`		`-`
`49`		`- m_currentScene = new Scene();`
`50`		`-`
	`48`	`+ m_currentScene.reset(new Scene());`
`51`	`49`	`SceneLoadEvent.Invoke();`
`52`	`50`	`}`
`53`	`51`
`54`		`-void OvCore::SceneSystem::SceneManager::LoadEmptyLightedScene()`
	`52`	`+void OvCore::SceneSystem::SceneManager::LoadDefaultScene()`
`55`	`53`	`{`
`56`	`54`	`UnloadCurrentScene();`
`57`		`-`
`58`		`- m_currentScene = new Scene();`
`59`		`-`
	`55`	`+ m_currentScene.reset(new Scene());`
	`56`	`+ m_currentScene->AddDefaultCamera();`
	`57`	`+ m_currentScene->AddDefaultLights();`
`60`	`58`	`SceneLoadEvent.Invoke();`
`61`		`-`
`62`		`- auto& directionalLight = m_currentScene->CreateActor("Directional Light");`
`63`		`- directionalLight.AddComponent<ECS::Components::CDirectionalLight>().SetIntensity(0.75f);`
`64`		`- directionalLight.transform.SetLocalPosition({ 0.0f, 10.0f, 0.0f });`
`65`		`- directionalLight.transform.SetLocalRotation(OvMaths::FQuaternion({ 120.0f, -40.0f, 0.0f }));`
`66`		`-`
`67`		`- auto& ambientLight = m_currentScene->CreateActor("Ambient Light");`
`68`		`- ambientLight.AddComponent<ECS::Components::CAmbientSphereLight>().SetRadius(10000.0f);`
`69`		`-`
`70`		`- auto& camera = m_currentScene->CreateActor("Main Camera");`
`71`		`- camera.AddComponent<ECS::Components::CCamera>();`
`72`		`- camera.transform.SetLocalPosition({ 0.0f, 3.0f, 8.0f });`
`73`		`- camera.transform.SetLocalRotation(OvMaths::FQuaternion({ 20.0f, 180.0f, 0.0f }));`
`74`	`59`	`}`
`75`	`60`
`76`	`61`	`bool OvCore::SceneSystem::SceneManager::LoadScene(const std::string& p_path, bool p_absolute)`
`@@ -114,8 +99,7 @@ void OvCore::SceneSystem::SceneManager::UnloadCurrentScene()`
`114`	`99`	`{`
`115`	`100`	`if (m_currentScene)`
`116`	`101`	`{`
`117`		`- delete m_currentScene;`
`118`		`- m_currentScene = nullptr;`
	`102`	`+ m_currentScene.release();`
`119`	`103`	`SceneUnloadEvent.Invoke();`
`120`	`104`	`}`
`121`	`105`
`@@ -124,12 +108,12 @@ void OvCore::SceneSystem::SceneManager::UnloadCurrentScene()`
`124`	`108`
`125`	`109`	`bool OvCore::SceneSystem::SceneManager::HasCurrentScene() const`
`126`	`110`	`{`
`127`		`- return m_currentScene;`
	`111`	`+ return m_currentScene != nullptr;`
`128`	`112`	`}`
`129`	`113`
`130`	`114`	`OvCore::SceneSystem::Scene* OvCore::SceneSystem::SceneManager::GetCurrentScene() const`
`131`	`115`	`{`
`132`		`- return m_currentScene;`
	`116`	`+ return m_currentScene.get();`
`133`	`117`	`}`
`134`	`118`
`135`	`119`	`std::string OvCore::SceneSystem::SceneManager::GetCurrentSceneSourcePath() const`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ OvEditor::Core::Editor::Editor(Context& p_context) :`
`38`	`38`	`Settings::EditorSettings::Load();`
`39`	`39`	`SetupUI();`
`40`	`40`
`41`		`- m_context.sceneManager.LoadEmptyLightedScene();`
	`41`	`+ m_context.sceneManager.LoadDefaultScene();`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`OvEditor::Core::Editor::~Editor()`
Original file line number	Diff line number	Diff line change
`@@ -51,17 +51,21 @@ void OvEditor::Core::EditorActions::LoadEmptyScene()`
`51`	`51`	`if (GetCurrentEditorMode() != EEditorMode::EDIT)`
`52`	`52`	`StopPlaying();`
`53`	`53`
`54`		`- m_context.sceneManager.LoadEmptyLightedScene();`
	`54`	`+ m_context.sceneManager.LoadEmptyScene();`
	`55`	`+ auto scene = m_context.sceneManager.GetCurrentScene();`
	`56`	`+ scene->AddDefaultCamera();`
	`57`	`+ scene->AddDefaultLights();`
	`58`	`+`
`55`	`59`	`OVLOG_INFO("New scene created");`
`56`	`60`	`}`
`57`	`61`
`58`		`-void OvEditor::Core::EditorActions::SaveCurrentSceneTo(const std::string& p_path)`
	`62`	`+void OvEditor::Core::EditorActions::SaveSceneToDisk(OvCore::SceneSystem::Scene& p_scene, const std::string& p_path)`
`59`	`63`	`{`
`60`	`64`	`tinyxml2::XMLDocument doc;`
`61`	`65`	`tinyxml2::XMLNode* node = doc.NewElement("root");`
`62`	`66`	`doc.InsertFirstChild(node);`
`63`	`67`	`m_context.sceneManager.StoreCurrentSceneSourcePath(p_path);`
`64`		`- m_context.sceneManager.GetCurrentScene()->OnSerialize(doc, node);`
	`68`	`+ p_scene.OnSerialize(doc, node);`
`65`	`69`	`doc.SaveFile(p_path.c_str());`
`66`	`70`	`}`
`67`	`71`
`@@ -84,8 +88,12 @@ void OvEditor::Core::EditorActions::SaveSceneChanges()`
`84`	`88`	`{`
`85`	`89`	`if (IsCurrentSceneLoadedFromDisk())`
`86`	`90`	`{`
`87`		`- SaveCurrentSceneTo(m_context.sceneManager.GetCurrentSceneSourcePath());`
`88`		`- OVLOG_INFO("Current scene saved to: " + m_context.sceneManager.GetCurrentSceneSourcePath());`
	`91`	`+ auto currentScene = m_context.sceneManager.GetCurrentScene();`
	`92`	`+ OVASSERT(currentScene, "Current scene is null");`
	`93`	`+`
	`94`	`+ const std::string currentScenePath = m_context.sceneManager.GetCurrentSceneSourcePath();`
	`95`	`+ SaveSceneToDisk(*currentScene, currentScenePath);`
	`96`	`+ OVLOG_INFO("Current scene saved to: " + currentScenePath);`
`89`	`97`	`}`
`90`	`98`	`else`
`91`	`99`	`{`
`@@ -112,7 +120,8 @@ void OvEditor::Core::EditorActions::SaveAs()`
`112`	`120`	`}`
`113`	`121`	`}`
`114`	`122`
`115`		`- SaveCurrentSceneTo(dialog.GetSelectedFilePath());`
	`123`	`+ auto currentScene = m_context.sceneManager.GetCurrentScene();`
	`124`	`+ SaveSceneToDisk(*currentScene, dialog.GetSelectedFilePath());`
`116`	`125`	`OVLOG_INFO("Current scene saved to: " + dialog.GetSelectedFilePath());`
`117`	`126`	`}`
`118`	`127`	`}`