Traktor: Fixed generating new id of all pasted or cloned entities in …

…scene editor.
apistol78 · Jan 27, 2024 · 7dee13b · 7dee13b
1 parent 3894e47
commit 7dee13b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 2 deletions.
diff --git a/code/Scene/Editor/SceneEditorContext.cpp b/code/Scene/Editor/SceneEditorContext.cpp
@@ -33,6 +33,7 @@
 #include "Scene/Editor/SceneAsset.h"
 #include "Scene/Editor/SceneEditorContext.h"
 #include "Scene/Editor/Traverser.h"
+#include "Scene/Editor/Utilities.h"
 #include "Scene/Editor/Events/CameraMovedEvent.h"
 #include "Scene/Editor/Events/MeasurementEvent.h"
 #include "Scene/Editor/Events/ModifierChangedEvent.h"
@@ -764,7 +765,7 @@ void SceneEditorContext::cloneSelected()
 		Ref< world::EntityData > clonedEntityData = DeepClone(selectedEntityAdapter->getEntityData()).create< world::EntityData >();
 		T_ASSERT(clonedEntityData);
 
-		clonedEntityData->setId(Guid::create());
+		generateEntityIds(clonedEntityData);
 
 		Ref< EntityAdapter > clonedEntityAdapter = new EntityAdapter(this);
 		clonedEntityAdapter->prepare(clonedEntityData, 0, 0);

diff --git a/code/Scene/Editor/SceneEditorPage.cpp b/code/Scene/Editor/SceneEditorPage.cpp
@@ -51,6 +51,7 @@
 #include "Scene/Editor/SceneEditorContext.h"
 #include "Scene/Editor/SceneEditorPage.h"
 #include "Scene/Editor/ScenePreviewControl.h"
+#include "Scene/Editor/Utilities.h"
 #include "Scene/Editor/Events/CameraMovedEvent.h"
 #include "Scene/Editor/Events/MeasurementEvent.h"
 #include "Scene/Editor/Events/PostBuildEvent.h"
@@ -724,7 +725,7 @@ bool SceneEditorPage::handleCommand(const ui::Command& command)
 		// Create new instances and adapters for each entity found in clipboard.
 		for (auto entityData : entityDatas)
 		{
-			entityData->setId(Guid::create());
+			generateEntityIds(entityData);
 
 			Ref< EntityAdapter > entityAdapter = new EntityAdapter(m_context);
 			entityAdapter->prepare(entityData, nullptr, 0);

diff --git a/code/Scene/Editor/Utilities.cpp b/code/Scene/Editor/Utilities.cpp
@@ -0,0 +1,26 @@
+/*
+ * TRAKTOR
+ * Copyright (c) 2024 Anders Pistol.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+#include "Scene/Editor/Traverser.h"
+#include "Scene/Editor/Utilities.h"
+#include "World/EntityData.h"
+
+namespace traktor::scene
+{
+
+void generateEntityIds(world::EntityData* entityData)
+{
+	entityData->setId(Guid::create());
+	Traverser::visit(entityData, [](world::EntityData* ed) -> Traverser::Result
+	{
+		ed->setId(Guid::create());
+		return Traverser::Result::Continue;
+	});
+}
+
+}
diff --git a/code/Scene/Editor/Utilities.h b/code/Scene/Editor/Utilities.h
@@ -0,0 +1,29 @@
+/*
+ * TRAKTOR
+ * Copyright (c) 2024 Anders Pistol.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+#pragma once
+
+namespace traktor::world
+{
+
+class EntityData;
+
+}
+
+namespace traktor::scene
+{
+
+/*! Recursively generate entity IDs.
+ * \ingroup Scene
+ *
+ * Using traversal to ensure all referenced entities
+ * get ID properly generated.
+ */
+void generateEntityIds(world::EntityData* entityData);
+
+}