Prefab references still broken

ChunkTreasure1 · Sep 29, 2023 · 2a70ac3 · 2a70ac3
1 parent f53a794
commit 2a70ac3
Show file tree

Hide file tree

Showing 6 changed files with 191 additions and 114 deletions.
diff --git a/Volt/Sandbox/src/Sandbox/Window/SceneViewPanel.cpp b/Volt/Sandbox/src/Sandbox/Window/SceneViewPanel.cpp
@@ -1060,7 +1060,7 @@ void SceneViewPanel::UpdatePrefabsInScene(Ref<Volt::Prefab> prefab, Volt::Entity
 		return;
 	}
 
-	m_scene->ForEachWithComponents<const Volt::PrefabComponent>([&](const entt::entity id, const Volt::PrefabComponent& prefabComp) 
+	m_scene->ForEachWithComponents<const Volt::PrefabComponent>([&](const entt::entity id, const Volt::PrefabComponent& prefabComp)
 	{
 		if (id == srcEntity.GetID())
 		{
@@ -1079,6 +1079,32 @@ void SceneViewPanel::UpdatePrefabsInScene(Ref<Volt::Prefab> prefab, Volt::Entity
 
 		prefabAsset->UpdateEntityInScene(Volt::Entity{ id, m_scene });
 	});
+
+	if (prefabAsset->IsReference(srcEntity))
+	{
+		m_scene->ForEachWithComponents<const Volt::PrefabComponent>([&](const entt::entity id, const Volt::PrefabComponent& prefabComp)
+		{
+			if (id == srcEntity.GetID())
+			{
+				return;
+			}
+
+			const auto& prefabRefData = prefabAsset->GetReferenceData(srcEntity);
+
+			if (prefabComp.prefabAsset != prefabRefData.prefabAsset || prefabComp.prefabEntity != prefabRefData.prefabReferenceEntity)
+			{
+				return;
+			}
+
+			Ref<Volt::Prefab> prefabRefAsset = Volt::AssetManager::GetAsset<Volt::Prefab>(prefabRefData.prefabAsset);
+			if (!prefabRefAsset || !prefabRefAsset->IsValid())
+			{
+				return;
+			}
+
+			prefabRefAsset->UpdateEntityInScene(Volt::Entity{ id, m_scene });
+		});
+	}
 }
 
 bool SceneViewPanel::SearchRecursively(Volt::Entity entity, const std::string& filter, uint32_t maxSearchDepth, uint32_t currentDepth)

diff --git a/Volt/Sandbox/src/Sandbox/Window/ViewportPanel.cpp b/Volt/Sandbox/src/Sandbox/Window/ViewportPanel.cpp
@@ -617,13 +617,18 @@ bool ViewportPanel::OnKeyPressedEvent(Volt::KeyPressedEvent& e)
 			EditorCommandStack::GetInstance().PushUndo(command);
 
 			bool shouldUpdateNavMesh = false;
-			for (const auto& i : entitiesToRemove)
+			for (const auto& entity : entitiesToRemove)
 			{
-				if (!shouldUpdateNavMesh && Sandbox::Get().CheckForUpdateNavMesh(i))
+				if (!entity)
+				{
+					continue;
+				}
+
+				if (!shouldUpdateNavMesh && Sandbox::Get().CheckForUpdateNavMesh(entity))
 				{
 					shouldUpdateNavMesh = true;
 				}
-				m_editorScene->RemoveEntity(i);
+				m_editorScene->RemoveEntity(entity);
 			}
 
 			if (shouldUpdateNavMesh)

diff --git a/Volt/Volt/src/Volt/Asset/Importers/PrefabImporter.cpp b/Volt/Volt/src/Volt/Asset/Importers/PrefabImporter.cpp
@@ -42,7 +42,11 @@ namespace Volt
 			{
 				entt::entity entityId = streamReader.ReadKey("entity", (entt::entity)entt::null);
 				AssetHandle prefabHandle = streamReader.ReadKey("prefabHandle", Asset::Null());
-				prefab->m_prefabReferencesMap[entityId] = prefabHandle;
+				entt::entity prefabEntityReference = streamReader.ReadKey("prefabEntityReference", (entt::entity)entt::null);
+
+				auto& prefabRefData = prefab->m_prefabReferencesMap[entityId];
+				prefabRefData.prefabAsset = prefabHandle;
+				prefabRefData.prefabReferenceEntity = prefabEntityReference;
 			});
 		}
 		streamReader.ExitScope();
@@ -78,7 +82,8 @@ namespace Volt
 			{
 				streamWriter.BeginMap();
 				streamWriter.SetKey("entity", ref.first);
-				streamWriter.SetKey("prefabHandle", ref.second);
+				streamWriter.SetKey("prefabHandle", ref.second.prefabAsset);
+				streamWriter.SetKey("prefabEntityReference", ref.second.prefabReferenceEntity);
 				streamWriter.EndMap();
 			}
 		}