Traktor: Scene asset operator data share base class to ensure valid data types are used.

Author: apistol78

code/Scene/Editor/ExternalOperationData.cpp

@@ -1,19 +1,20 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2026 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/ExternalOperationData.h"
+
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/Member.h"
-#include "Scene/Editor/ExternalOperationData.h"
 
 namespace traktor::scene
 {
 
-T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.scene.ExternalOperationData", 0, ExternalOperationData, ISerializable)
+T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.scene.ExternalOperationData", 0, ExternalOperationData, ISceneOperationData)
 
 void ExternalOperationData::serialize(ISerializer& s)
 {

code/Scene/Editor/ExternalOperationData.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-2026 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
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Core/Guid.h"
-#include "Core/Serialization/ISerializable.h"
+#include "Scene/Editor/ISceneOperationData.h"
 
 // import/export mechanism.
 #undef T_DLLCLASS
@@ -22,7 +22,7 @@
 namespace traktor::scene
 {
 
-class T_DLLCLASS ExternalOperationData : public ISerializable
+class T_DLLCLASS ExternalOperationData : public ISceneOperationData
 {
 	T_RTTI_CLASS;
 

code/Scene/Editor/ISceneOperationData.cpp

@@ -0,0 +1,16 @@
+/*
+ * TRAKTOR
+ * Copyright (c) 2026 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/ISceneOperationData.h"
+
+namespace traktor::scene
+{
+
+T_IMPLEMENT_RTTI_CLASS(L"traktor.scene.ISceneOperationData", ISceneOperationData, ISerializable)
+
+}

code/Scene/Editor/ISceneOperationData.h

@@ -0,0 +1,29 @@
+/*
+ * TRAKTOR
+ * Copyright (c) 2026 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
+
+#include "Core/Serialization/ISerializable.h"
+
+// import/export mechanism.
+#undef T_DLLCLASS
+#if defined(T_SCENE_EDITOR_EXPORT)
+#	define T_DLLCLASS T_DLLEXPORT
+#else
+#	define T_DLLCLASS T_DLLIMPORT
+#endif
+
+namespace traktor::scene
+{
+
+class T_DLLCLASS ISceneOperationData : public ISerializable
+{
+	T_RTTI_CLASS;
+};
+
+}

code/Scene/Editor/SceneAsset.cpp

@@ -1,11 +1,13 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022-2024 Anders Pistol.
+ * Copyright (c) 2022-2026 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/SceneAsset.h"
+
 #include "Core/Serialization/AttributePrivate.h"
 #include "Core/Serialization/ISerializer.h"
 #include "Core/Serialization/MemberComposite.h"
@@ -14,8 +16,8 @@
 #include "Core/Serialization/MemberSmallMap.h"
 #include "Render/ITexture.h"
 #include "Resource/Member.h"
+#include "Scene/Editor/ISceneOperationData.h"
 #include "Scene/Scene.h"
-#include "Scene/Editor/SceneAsset.h"
 #include "World/EntityData.h"
 #include "World/IWorldComponentData.h"
 #include "World/WorldRenderSettings.h"
@@ -83,12 +85,12 @@ const RefArray< world::EntityData >& SceneAsset::getLayers() const
 	return m_layers;
 }
 
-void SceneAsset::setOperationData(const RefArray< ISerializable >& operationData)
+void SceneAsset::setOperationData(const RefArray< ISceneOperationData >& operationData)
 {
 	m_operationData = operationData;
 }
 
-const RefArray< ISerializable >& SceneAsset::getOperationData() const
+const RefArray< ISceneOperationData >& SceneAsset::getOperationData() const
 {
 	return m_operationData;
 }
@@ -100,7 +102,7 @@ void SceneAsset::serialize(ISerializer& s)
 	s >> MemberRef< world::WorldRenderSettings >(L"worldRenderSettings", m_worldRenderSettings);
 	s >> MemberRefArray< world::IWorldComponentData >(L"worldComponents", m_worldComponents);
 	s >> MemberRefArray< world::EntityData >(L"layers", m_layers, AttributePrivate());
-	s >> MemberRefArray< ISerializable >(L"operationData", m_operationData);
+	s >> MemberRefArray< ISceneOperationData >(L"operationData", m_operationData);
 }
 
 }

code/Scene/Editor/SceneAsset.h

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022-2024 Anders Pistol.
+ * Copyright (c) 2022-2026 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
@@ -33,6 +33,8 @@ class WorldRenderSettings;
 namespace traktor::scene
 {
 
+class ISceneOperationData;
+
 class T_DLLCLASS SceneAsset : public ISerializable
 {
 	T_RTTI_CLASS;
@@ -72,17 +74,17 @@ class T_DLLCLASS SceneAsset : public ISerializable
 
 	const RefArray< world::EntityData >& getLayers() const;
 
-	void setOperationData(const RefArray< ISerializable >& operationData);
+	void setOperationData(const RefArray< ISceneOperationData >& operationData);
 
-	const RefArray< ISerializable >& getOperationData() const;
+	const RefArray< ISceneOperationData >& getOperationData() const;
 
 	virtual void serialize(ISerializer& s) override final;
 
 private:
 	Ref< world::WorldRenderSettings > m_worldRenderSettings;
 	RefArray< world::IWorldComponentData > m_worldComponents;
 	RefArray< world::EntityData > m_layers;
-	RefArray< ISerializable > m_operationData;
+	RefArray< ISceneOperationData > m_operationData;
 };
 
 }

code/Scene/Editor/SceneEditorPage.cpp

@@ -51,6 +51,7 @@
 #include "Scene/Editor/Events/PreModifyEvent.h"
 #include "Scene/Editor/Events/SceneSelectionChangeEvent.h"
 #include "Scene/Editor/ISceneEditorPlugin.h"
+#include "Scene/Editor/ISceneOperationData.h"
 #include "Scene/Editor/IWorldComponentEditor.h"
 #include "Scene/Editor/IWorldComponentEditorFactory.h"
 #include "Scene/Editor/SceneAsset.h"
@@ -118,33 +119,6 @@ constexpr int32_t c_instanceGridDynamic = 1;
 constexpr int32_t c_instanceGridVisible = 2;
 constexpr int32_t c_instanceGridLocked = 3;
 
-void renameIds(ISerializable* object, const SmallMap< Guid, Guid >& renamedMap)
-{
-	Ref< Reflection > reflection = Reflection::create(object);
-
-	// Rename all id;s in this object first.
-	RefArray< ReflectionMember > idMembers;
-	reflection->findMembers(RfpMemberType(type_of< RfmPrimitiveGuid >()), idMembers);
-	for (auto idMember : idMembers)
-	{
-		auto id = static_cast< RfmPrimitiveGuid* >(idMember.ptr());
-		auto it = renamedMap.find(id->get());
-		if (it != renamedMap.end())
-			id->set(it->second);
-	}
-
-	// Recurse with child objects.
-	RefArray< ReflectionMember > objectMembers;
-	reflection->findMembers(RfpMemberType(type_of< RfmObject >()), objectMembers);
-	for (auto objectMember : objectMembers)
-	{
-		auto object = static_cast< RfmObject* >(objectMember.ptr());
-		renameIds(object->get(), renamedMap);
-	}
-
-	reflection->apply(object);
-}
-
 bool isChildEntitySelected(const EntityAdapter* entityAdapter)
 {
 	for (auto child : entityAdapter->getChildren())
@@ -976,20 +950,11 @@ bool SceneEditorPage::handleCommand(const ui::Command& command)
 	{
 		if (ui::MessageBox::show(m_editControl, i18n::Text(L"SCENE_EDITOR_RENAME_ALL_ENTITY_IDS_MESSAGE"), i18n::Text(L"SCENE_EDITOR_RENAME_ALL_ENTITY_IDS_TITLE"), ui::MbIconExclamation | ui::MbYesNo) == ui::DialogResult::Yes)
 		{
-			SmallMap< Guid, Guid > renamedMap;
-
-			// Create new IDs for each entity.
 			for (auto entity : m_context->getEntities(SceneEditorContext::GfDescendants))
 			{
-				Guid newEntityId = Guid::create();
-				if (entity->getEntityData()->getId().isNotNull())
-					renamedMap.insert(entity->getEntityData()->getId(), newEntityId);
+				const Guid newEntityId = Guid::create();
 				entity->getEntityData()->setId(newEntityId);
 			}
-
-			// Also ensure attached data contain updated entity identities.
-			for (auto operationData : m_context->getSceneAsset()->getOperationData())
-				renameIds(operationData, renamedMap);
 		}
 	}
 	else if (command == L"Scene.Editor.PlaceOnGround")

code/Scene/Editor/SceneEditorPageFactory.cpp

@@ -15,6 +15,7 @@
 #include "Editor/IEditor.h"
 #include "Scene/Editor/ISceneEditorUIExtension.h"
 #include "Scene/Editor/ISceneEditorPlugin.h"
+#include "Scene/Editor/ISceneOperationData.h"
 #include "Scene/Editor/SceneAsset.h"
 #include "Scene/Editor/SceneEditorPage.h"
 #include "Scene/Editor/SceneEditorPageFactory.h"
@@ -24,37 +25,6 @@
 
 namespace traktor::scene
 {
-	namespace
-	{
-
-void renameIds(ISerializable* object, const SmallMap< Guid, Guid >& renamedMap)
-{
-	Ref< Reflection > reflection = Reflection::create(object);
-
-	// Rename all id;s in this object first.
-	RefArray< ReflectionMember > idMembers;
-	reflection->findMembers(RfpMemberType(type_of< RfmPrimitiveGuid >()), idMembers);
-	for (auto idMember : idMembers)
-	{
-		auto id = static_cast< RfmPrimitiveGuid* >(idMember.ptr());
-		auto it = renamedMap.find(id->get());
-		if (it != renamedMap.end())
-			id->set(it->second);
-	}
-
-	// Recurse with child objects.
-	RefArray< ReflectionMember > objectMembers;
-	reflection->findMembers(RfpMemberType(type_of< RfmObject >()), objectMembers);
-	for (auto objectMember : objectMembers)
-	{
-		auto object = static_cast< RfmObject* >(objectMember.ptr());
-		renameIds(object->get(), renamedMap);
-	}
-
-	reflection->apply(object);
-}
-
-	}
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.scene.SceneEditorPageFactory", 0, SceneEditorPageFactory, editor::IEditorPageFactory)
 
@@ -144,36 +114,21 @@ Ref< ISerializable > SceneEditorPageFactory::cloneAsset(const ISerializable* ass
 
 	if (auto mutableSceneAsset = dynamic_type_cast< SceneAsset* >(mutableAsset))
 	{
-		SmallMap< Guid, Guid > renamedMap;
-
-		// Rename all entities.
 		Traverser::visit(mutableSceneAsset, [&](Ref< world::EntityData >& inoutEntityData) -> Traverser::Result {
-			Guid newEntityId = Guid::create();
-			if (inoutEntityData->getId().isNotNull())
-				renamedMap.insert(inoutEntityData->getId(), newEntityId);
+			const Guid newEntityId = Guid::create();
 			inoutEntityData->setId(newEntityId);
 			return Traverser::Result::Continue;
 		});
-
-		// Also ensure attached data contain updated entity identities.
-		for (auto operationData : mutableSceneAsset->getOperationData())
-			renameIds(operationData, renamedMap);
 	}
 	else if (auto mutableEntityData = dynamic_type_cast< world::EntityData* >(mutableAsset))
 	{
-		SmallMap< Guid, Guid > renamedMap;
-
 		// Rename root entity data.
-		Guid newEntityId = Guid::create();
-		if (mutableEntityData->getId().isNotNull())
-			renamedMap.insert(mutableEntityData->getId(), newEntityId);
+		const Guid newEntityId = Guid::create();
 		mutableEntityData->setId(newEntityId);
 
 		// Rename all entities.
 		Traverser::visit(mutableEntityData, [&](Ref< world::EntityData >& inoutEntityData) -> Traverser::Result {
-			Guid newEntityId = Guid::create();
-			if (inoutEntityData->getId().isNotNull())
-				renamedMap.insert(inoutEntityData->getId(), newEntityId);
+			const Guid newEntityId = Guid::create();
 			inoutEntityData->setId(newEntityId);
 			return Traverser::Result::Continue;
 		});		

code/Scene/Editor/ScenePipeline.cpp

@@ -18,6 +18,7 @@
 #include "Editor/Pipeline/PipelineProfiler.h"
 #include "Scene/SceneResource.h"
 #include "Scene/Editor/ExternalOperationData.h"
+#include "Scene/Editor/ISceneOperationData.h"
 #include "Scene/Editor/IScenePipelineOperator.h"
 #include "Scene/Editor/ScenePipeline.h"
 #include "Scene/Editor/SceneAsset.h"
@@ -97,12 +98,12 @@ bool ScenePipeline::buildDependencies(
 	Ref< SceneAsset > mutableSceneAsset = DeepClone(sceneAsset).create< SceneAsset >();
 	for (const auto op : sceneAsset->getOperationData())
 	{
-		Ref< const ISerializable > operationData = op;
+		Ref< const ISceneOperationData > operationData = op;
 
 		// Check if external data is references; if so add dependency and resolve external data.
 		if (const ExternalOperationData* externalOperationData = dynamic_type_cast< const ExternalOperationData* >(operationData))
 		{
-			operationData = pipelineDepends->getObjectReadOnly(externalOperationData->getExternalDataId());
+			operationData = pipelineDepends->getObjectReadOnly< ISceneOperationData >(externalOperationData->getExternalDataId());
 			if (!operationData)
 			{
 				log::error << L"Scene pipeline failed; unable to read operation data " << externalOperationData->getExternalDataId().format() << L"." << Endl;

code/Shape/Editor/Bake/BakeConfiguration.cpp

@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022-2024 Anders Pistol.
+ * Copyright (c) 2022-2026 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
@@ -18,7 +18,7 @@
 namespace traktor::shape
 {
 
-T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.shape.BakeConfiguration", 33, BakeConfiguration, ISerializable)
+T_IMPLEMENT_RTTI_EDIT_CLASS(L"traktor.shape.BakeConfiguration", 33, BakeConfiguration, scene::ISceneOperationData)
 
 uint32_t BakeConfiguration::calculateModelRelevanteHash() const
 {