Continued work on WorldEngine

Volt/Sandbox/src/Sandbox/Modals/ConvertToWorldEngineModal.cpp

@@ -0,0 +1,58 @@
+#include "sbpch.h"
+#include "ConvertToWorldEngineModal.h"
+
+#include <Volt/Asset/AssetManager.h>
+#include <Volt/Scene/Scene.h>
+
+#include <Volt/Utility/FileSystem.h>
+
+#include <imgui.h>
+
+ConvertToWorldEngineModal::ConvertToWorldEngineModal(const std::string& stringId)
+	: Modal(stringId)
+{
+}
+
+ConvertToWorldEngineModal::~ConvertToWorldEngineModal()
+{
+}
+
+void ConvertToWorldEngineModal::DrawModalContent()
+{
+	ImGui::Text("Are you sure you want to convert to WorldEngine?");
+
+	ImGui::SameLine();
+
+	if (ImGui::Button("Convert"))
+	{
+		m_scene->GetSceneSettingsMutable().useWorldEngine = true;
+
+		const auto& metadata = Volt::AssetManager::GetMetadataFromHandle(m_scene->handle);
+		if (metadata.IsValid())
+		{
+			const std::filesystem::path directoryPath = Volt::AssetManager::GetFilesystemPath(metadata.filePath);
+			const std::filesystem::path layersPath = directoryPath / "Layers";
+
+			if (std::filesystem::exists(directoryPath) && std::filesystem::exists(layersPath))
+			{
+				FileSystem::MoveToRecycleBin(layersPath);
+			}
+		}
+
+		Volt::AssetManager::SaveAsset(m_scene.GetSharedPtr());
+		Close();
+	}
+
+	ImGui::SameLine();
+
+	if (ImGui::Button("Cancel"))
+	{
+		m_scene->GetSceneSettingsMutable().useWorldEngine = false;
+		Close();
+	}
+}
+
+void ConvertToWorldEngineModal::OnClose()
+{
+	m_scene.Reset();
+}

Volt/Sandbox/src/Sandbox/Modals/ConvertToWorldEngineModal.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "Sandbox/Modals/Modal.h"
+
+namespace Volt
+{
+	class Scene;
+}
+
+class ConvertToWorldEngineModal : public Modal
+{
+public:
+	ConvertToWorldEngineModal(const std::string& stringId);
+	~ConvertToWorldEngineModal();
+
+	inline void SetCurrentScene(Weak<Volt::Scene> scene) { m_scene = scene; }
+
+protected:
+	void DrawModalContent() override;
+	void OnClose() override;
+
+protected:
+	Weak<Volt::Scene> m_scene;
+};

Volt/Sandbox/src/Sandbox/Modals/Modal.h

@@ -4,6 +4,8 @@
 
 #include <string>
 
+typedef Volt::UUID ModalID;
+
 class Modal
 {
 public:
@@ -14,7 +16,7 @@ class Modal
 	void Close();
 	bool Update();
 
-	inline const Volt::UUID GetID() const { return m_id; }
+	inline const ModalID GetID() const { return m_id; }
 
 protected:
 	virtual void DrawModalContent() = 0;
@@ -26,6 +28,6 @@ class Modal
 
 	bool m_wasOpenLastFrame = false;
 
-	Volt::UUID m_id;
+	ModalID m_id;
 	std::string m_strId;
 };

Volt/Sandbox/src/Sandbox/Sandbox.cpp

@@ -41,6 +41,7 @@
 #include "Sandbox/Window/Net/NetPanel.h"
 #include "Sandbox/Window/Net/NetContractPanel.h"
 #include "Sandbox/Window/BehaviourGraph/BehaviorPanel.h"
+#include "Sandbox/Window/SceneSettingsPanel.h"
 #include "Sandbox/VertexPainting/VertexPainterPanel.h"
 
 #include "Sandbox/Utility/EditorResources.h"
@@ -117,9 +118,6 @@ void Sandbox::OnAttach()
 
 	NewScene();
 
-	// WIP Panels.
-#ifndef VT_DIST 
-
 	// Shelved Panels (So panel tab doesn't get cluttered up).
 #ifdef VT_DEBUG
 	EditorLibrary::RegisterWithType<PrefabEditorPanel>("", Volt::AssetType::Prefab);
@@ -128,8 +126,6 @@ void Sandbox::OnAttach()
 	EditorLibrary::Register<TaigaPanel>("Advanced");
 	EditorLibrary::Register<ThemesPanel>("Advanced");
 	EditorLibrary::Register<CurveGraphPanel>("Advanced");
-#endif
-
 #endif
 
 	myNavigationPanel = EditorLibrary::Register<NavigationPanel>("Advanced", myRuntimeScene);
@@ -148,6 +144,7 @@ void Sandbox::OnAttach()
 
 	EditorLibrary::Register<NetPanel>("Advanced");
 	EditorLibrary::Register<NetContractPanel>("Advanced");
+	EditorLibrary::Register<SceneSettingsPanel>("", myRuntimeScene);
 
 	if (userSettings.sceneSettings.lowMemoryUsage)
 	{

Volt/Sandbox/src/Sandbox/Utility/ComponentPropertyUtilities.cpp

@@ -311,6 +311,7 @@ void ComponentPropertyUtility::DrawComponentDefaultMemberArray(Weak<Volt::Scene>
 		if (EditorUtils::Property(label, *reinterpret_cast<Volt::AssetHandle*>(elementData), arrayMember.assetType))
 		{
 			AddLocalChangeToEntity(entity, arrayMember.ownerTypeDesc->GetGUID(), arrayMember.name);
+			EditorUtils::MarkEntityAsEdited(entity);
 		}
 		return;
 	}
@@ -320,6 +321,7 @@ void ComponentPropertyUtility::DrawComponentDefaultMemberArray(Weak<Volt::Scene>
 		if (UI::PropertyColor(label, *reinterpret_cast<glm::vec3*>(elementData)))
 		{
 			AddLocalChangeToEntity(entity, arrayMember.ownerTypeDesc->GetGUID(), arrayMember.name);
+			EditorUtils::MarkEntityAsEdited(entity);
 		}
 		return;
 	}
@@ -329,6 +331,7 @@ void ComponentPropertyUtility::DrawComponentDefaultMemberArray(Weak<Volt::Scene>
 		if (UI::PropertyColor(label, *reinterpret_cast<glm::vec4*>(elementData)))
 		{
 			AddLocalChangeToEntity(entity, arrayMember.ownerTypeDesc->GetGUID(), arrayMember.name);
+			EditorUtils::MarkEntityAsEdited(entity);
 		}
 		return;
 	}
@@ -339,6 +342,7 @@ void ComponentPropertyUtility::DrawComponentDefaultMemberArray(Weak<Volt::Scene>
 		if (UI::PropertyEntity(label, scene, *reinterpret_cast<Volt::EntityID*>(elementData)))
 		{
 			AddLocalChangeToEntity(entity, arrayMember.ownerTypeDesc->GetGUID(), arrayMember.name);
+			EditorUtils::MarkEntityAsEdited(entity);
 		}
 		return;
 	}
@@ -351,6 +355,7 @@ void ComponentPropertyUtility::DrawComponentDefaultMemberArray(Weak<Volt::Scene>
 	if (s_propertyFunctions.at(typeIndex)(label, elementData, 0))
 	{
 		AddLocalChangeToEntity(entity, arrayMember.ownerTypeDesc->GetGUID(), arrayMember.name);
+		EditorUtils::MarkEntityAsEdited(entity);
 	}
 }
 
@@ -383,6 +388,7 @@ void ComponentPropertyUtility::DrawComponentEnum(Weak<Volt::Scene> scene, Volt::
 	{
 		currentValue = indexToValueMap.at(currentValue);
 		AddLocalChangeToEntity(entity, member.ownerTypeDesc->GetGUID(), member.name);
+		EditorUtils::MarkEntityAsEdited(entity);
 	}
 }
 
@@ -446,6 +452,8 @@ void ComponentPropertyUtility::DrawComponentArray(Weak<Volt::Scene> scene, Volt:
 		{
 			arrayDesc->EmplaceBack(arrayPtr, nullptr);
 			AddLocalChangeToEntity(entity, member.ownerTypeDesc->GetGUID(), member.name);
+
+			EditorUtils::MarkEntityAsEdited(entity);
 		}
 
 		ImGui::TreePop();
@@ -566,7 +574,6 @@ void ComponentPropertyUtility::DrawMonoMembers(Weak<Volt::Scene> scene, const Vo
 				if (EditorUtils::Property(displayName, value, field.type.assetType))
 				{
 					scriptInstance->SetField(name, &value);
-					AddLocalChangeToEntity(entity, scriptEntry.name, name);
 				}
 
 				continue;
@@ -713,7 +720,7 @@ void ComponentPropertyUtility::DrawMonoMembers(Weak<Volt::Scene> scene, const Vo
 						scriptInstance->SetField(name, str);
 					}
 
-					AddLocalChangeToEntity(entity, scriptEntry.name, name);
+					fieldChanged = true;
 				}
 			}
 			else if (field.type.IsEntity())
@@ -762,7 +769,6 @@ void ComponentPropertyUtility::DrawMonoMembers(Weak<Volt::Scene> scene, const Vo
 			if (scriptInstance && fieldChanged)
 			{
 				scriptInstance->SetField(name, currentField->data.As<void>());
-
 				AddLocalChangeToEntity(entity, scriptEntry.name, name);
 			}
 
@@ -816,6 +822,8 @@ void ComponentPropertyUtility::AddLocalChangeToEntity(Volt::Entity entity, const
 	auto& newChange = prefabComp.componentLocalChanges.emplace_back();
 	newChange.componentGUID = componentGuid;
 	newChange.memberName = strMemberName;
+
+	EditorUtils::MarkEntityAsEdited(entity);
 }
 
 void ComponentPropertyUtility::AddLocalChangeToEntity(Volt::Entity entity, const std::string& scriptName, std::string_view memberName)
@@ -841,4 +849,6 @@ void ComponentPropertyUtility::AddLocalChangeToEntity(Volt::Entity entity, const
 	auto& newChange = prefabComp.scriptLocalChanges.emplace_back();
 	newChange.scriptName = scriptName;
 	newChange.memberName = memberName;
+
+	EditorUtils::MarkEntityAsEdited(entity);
 }

Volt/Sandbox/src/Sandbox/Utility/EditorUtilities.cpp

@@ -978,3 +978,9 @@ std::filesystem::path EditorUtils::GetThumbnailPathFromPath(const std::filesyste
 {
 	return path.string() + ".vtthumb.png";
 }
+
+void EditorUtils::MarkEntityAsEdited(const Volt::Entity& entity)
+{
+	auto scene = entity.GetScene();
+	scene->MarkEntityAsEdited(entity);
+}

Volt/Sandbox/src/Sandbox/Utility/EditorUtilities.h

@@ -80,6 +80,8 @@ class EditorUtils
 	static bool HasThumbnail(const std::filesystem::path& path);
 	static std::filesystem::path GetThumbnailPathFromPath(const std::filesystem::path& path);
 
+	static void MarkEntityAsEdited(const Volt::Entity& entity);
+
 private:
 	static bool AssetBrowserPopupInternal(const std::string& id, Volt::AssetHandle& assetHandle, bool startState, Volt::AssetType wantedType = Volt::AssetType::None);
 	struct DefaultFalse

Volt/Sandbox/src/Sandbox/Window/PropertiesPanel.cpp

@@ -61,7 +61,10 @@ void PropertiesPanel::UpdateMainContent()
 		if (firstEntity.HasComponent<Volt::TagComponent>())
 		{
 			auto& tag = firstEntity.GetComponent<Volt::TagComponent>();
-			UI::InputText("Name", tag.tag);
+			if (UI::InputText("Name", tag.tag))
+			{
+				EditorUtils::MarkEntityAsEdited(firstEntity);
+			}
 		}
 	}
 	else
@@ -110,6 +113,7 @@ void PropertiesPanel::UpdateMainContent()
 				if (entity.HasComponent<Volt::TagComponent>())
 				{
 					entity.GetComponent<Volt::TagComponent>().tag = inputText;
+					EditorUtils::MarkEntityAsEdited(entity);
 				}
 			}
 		}
@@ -146,6 +150,8 @@ void PropertiesPanel::UpdateMainContent()
 						Volt::Entity ent = myCurrentScene->GetEntityFromUUID(entId);
 						ent.SetLocalPosition(transform.position);
 						myCurrentScene->InvalidateEntityTransform(entId);
+
+						EditorUtils::MarkEntityAsEdited(ent);
 					}
 				}
 
@@ -169,6 +175,8 @@ void PropertiesPanel::UpdateMainContent()
 						Volt::Entity ent = myCurrentScene->GetEntityFromUUID(entId);
 						ent.SetLocalRotation(transform.rotation);
 						myCurrentScene->InvalidateEntityTransform(entId);
+
+						EditorUtils::MarkEntityAsEdited(ent);
 					}
 				}
 
@@ -188,6 +196,8 @@ void PropertiesPanel::UpdateMainContent()
 						Volt::Entity ent = myCurrentScene->GetEntityFromUUID(entId);
 						ent.SetLocalScale(transform.scale);
 						myCurrentScene->InvalidateEntityTransform(entId);
+
+						EditorUtils::MarkEntityAsEdited(ent);
 					}
 				}
 
@@ -316,9 +326,12 @@ void PropertiesPanel::AddComponentPopup()
 					{
 						for (auto& ent : SelectionManager::GetSelectedEntities())
 						{
-							if (!Volt::ComponentRegistry::Helpers::HasComponentWithGUID(compGuid, myCurrentScene->GetRegistry(), myCurrentScene->GetHandleFromUUID(ent)))
+							auto entity = myCurrentScene->GetEntityFromUUID(ent);
+							EditorUtils::MarkEntityAsEdited(entity);
+
+							if (!Volt::ComponentRegistry::Helpers::HasComponentWithGUID(compGuid, myCurrentScene->GetRegistry(), entity))
 							{
-								Volt::ComponentRegistry::Helpers::AddComponentWithGUID(compGuid, myCurrentScene->GetRegistry(), myCurrentScene->GetHandleFromUUID(ent));
+								Volt::ComponentRegistry::Helpers::AddComponentWithGUID(compGuid, myCurrentScene->GetRegistry(), entity);
 							}
 
 							if (newMonoScript)
@@ -394,6 +407,7 @@ void PropertiesPanel::AddMonoScriptPopup()
 					for (auto& id : SelectionManager::GetSelectedEntities())
 					{
 						Volt::Entity entity = myCurrentScene->GetEntityFromUUID(id);
+						EditorUtils::MarkEntityAsEdited(entity);
 
 						if (!entity.HasComponent<Volt::MonoScriptComponent>())
 						{
@@ -438,6 +452,7 @@ void PropertiesPanel::AddMonoScriptPopup()
 				for (auto& id : SelectionManager::GetSelectedEntities())
 				{
 					Volt::Entity entity = myCurrentScene->GetEntityFromUUID(id);
+					EditorUtils::MarkEntityAsEdited(entity);
 
 					if (!entity.HasComponent<Volt::MonoScriptComponent>())
 					{
@@ -506,6 +521,7 @@ void PropertiesPanel::AcceptMonoDragDrop()
 				for (auto& id : SelectionManager::GetSelectedEntities())
 				{
 					Volt::Entity entity = myCurrentScene->GetEntityFromUUID(id);
+					EditorUtils::MarkEntityAsEdited(entity);
 
 					if (!entity.HasComponent<Volt::MonoScriptComponent>())
 					{

Volt/Sandbox/src/Sandbox/Window/SceneSettingsPanel.cpp

@@ -0,0 +1,30 @@
+#include "sbpch.h"
+#include "SceneSettingsPanel.h"
+
+#include "Sandbox/Modals/ConvertToWorldEngineModal.h"
+#include "Sandbox/UISystems/ModalSystem.h"
+
+#include <Volt/Utility/UIUtility.h>
+
+SceneSettingsPanel::SceneSettingsPanel(Ref<Volt::Scene>& editorScene)
+	: EditorWindow("Scene Settings"), m_editorScene(editorScene)
+{
+	auto& modal = ModalSystem::AddModal<ConvertToWorldEngineModal>("Convert To World Engine##sceneSettings");
+	m_convertionModal = modal.GetID();
+}
+
+void SceneSettingsPanel::UpdateMainContent()
+{
+	auto& sceneSettings = m_editorScene->GetSceneSettingsMutable();
+
+	if (UI::BeginProperties("sceneSettings"))
+	{
+		if (UI::Property("Use World Engine", sceneSettings.useWorldEngine))
+		{
+			ModalSystem::GetModal<ConvertToWorldEngineModal>(m_convertionModal).SetCurrentScene(m_editorScene);
+			ModalSystem::GetModal<ConvertToWorldEngineModal>(m_convertionModal).Open();
+		}
+
+		UI::EndProperties();
+	}
+}