Traktor: Theater module re-implemented.

apistol78 · Apr 17, 2024 · 2c0eaac · 2c0eaac
1 parent 2192527
commit 2c0eaac
Show file tree

Hide file tree

Showing 66 changed files with 938 additions and 1,080 deletions.
diff --git a/code/Ai/NavMeshEntityFactory.cpp b/code/Ai/NavMeshEntityFactory.cpp
@@ -15,39 +15,19 @@
 namespace traktor::ai
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.ai.NavMeshEntityFactory", NavMeshEntityFactory, world::IEntityFactory)
+T_IMPLEMENT_RTTI_CLASS(L"traktor.ai.NavMeshEntityFactory", NavMeshEntityFactory, world::AbstractEntityFactory)
 
 NavMeshEntityFactory::NavMeshEntityFactory(resource::IResourceManager* resourceManager, bool suppress)
 :	m_resourceManager(resourceManager)
 ,	m_suppress(suppress)
 {
 }
 
-const TypeInfoSet NavMeshEntityFactory::getEntityTypes() const
-{
-	return TypeInfoSet();
-}
-
-const TypeInfoSet NavMeshEntityFactory::getEntityEventTypes() const
-{
-	return TypeInfoSet();
-}
-
 const TypeInfoSet NavMeshEntityFactory::getEntityComponentTypes() const
 {
 	return makeTypeInfoSet< NavMeshComponentData >();
 }
 
-Ref< world::Entity > NavMeshEntityFactory::createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const
-{
-	return nullptr;
-}
-
-Ref< world::IEntityEvent > NavMeshEntityFactory::createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const
-{
-	return nullptr;
-}
-
 Ref< world::IEntityComponent > NavMeshEntityFactory::createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const
 {
 	if (!m_suppress)

diff --git a/code/Ai/NavMeshEntityFactory.h b/code/Ai/NavMeshEntityFactory.h
@@ -1,14 +1,14 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
 
-#include "World/IEntityFactory.h"
+#include "World/AbstractEntityFactory.h"
 
 // import/export mechanism.
 #undef T_DLLCLASS
@@ -31,23 +31,15 @@ namespace traktor::ai
 /*! Navigation mesh entity factory.
  * \ingroup AI
  */
-class T_DLLCLASS NavMeshEntityFactory : public world::IEntityFactory
+class T_DLLCLASS NavMeshEntityFactory : public world::AbstractEntityFactory
 {
 	T_RTTI_CLASS;
 
 public:
 	explicit NavMeshEntityFactory(resource::IResourceManager* resourceManager, bool suppress);
 
-	virtual const TypeInfoSet getEntityTypes() const override final;
-
-	virtual const TypeInfoSet getEntityEventTypes() const override final;
-
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;
 
-	virtual Ref< world::Entity > createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const override final;
-
-	virtual Ref< world::IEntityEvent > createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const override final;
-
 	virtual Ref< world::IEntityComponent > createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const override final;
 
 private:

diff --git a/code/Animation/AnimationEntityFactory.cpp b/code/Animation/AnimationEntityFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
@@ -29,7 +29,7 @@
 namespace traktor::animation
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.animation.AnimationEntityFactory", AnimationEntityFactory, world::IEntityFactory)
+T_IMPLEMENT_RTTI_CLASS(L"traktor.animation.AnimationEntityFactory", AnimationEntityFactory, world::AbstractEntityFactory)
 
 AnimationEntityFactory::AnimationEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, physics::PhysicsManager* physicsManager)
 :	m_resourceManager(resourceManager)
@@ -38,16 +38,6 @@ AnimationEntityFactory::AnimationEntityFactory(resource::IResourceManager* resou
 {
 }
 
-const TypeInfoSet AnimationEntityFactory::getEntityTypes() const
-{
-	return TypeInfoSet();
-}
-
-const TypeInfoSet AnimationEntityFactory::getEntityEventTypes() const
-{
-	return TypeInfoSet();
-}
-
 const TypeInfoSet AnimationEntityFactory::getEntityComponentTypes() const
 {
 	TypeInfoSet typeSet;
@@ -65,16 +55,6 @@ const TypeInfoSet AnimationEntityFactory::getEntityComponentTypes() const
 	return typeSet;
 }
 
-Ref< world::Entity > AnimationEntityFactory::createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const
-{
-	return nullptr;
-}
-
-Ref< world::IEntityEvent > AnimationEntityFactory::createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const
-{
-	return nullptr;
-}
-
 Ref< world::IEntityComponent > AnimationEntityFactory::createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const
 {
 	if (auto animatedMeshComponentData = dynamic_type_cast< const AnimatedMeshComponentData* >(&entityComponentData))

diff --git a/code/Animation/AnimationEntityFactory.h b/code/Animation/AnimationEntityFactory.h
@@ -1,14 +1,14 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
 
-#include "World/IEntityFactory.h"
+#include "World/AbstractEntityFactory.h"
 
 // import/export mechanism.
 #undef T_DLLCLASS
@@ -45,23 +45,15 @@ namespace traktor::animation
 /*! Animation entity factory.
  * \ingroup Animation
  */
-class T_DLLCLASS AnimationEntityFactory : public world::IEntityFactory
+class T_DLLCLASS AnimationEntityFactory : public world::AbstractEntityFactory
 {
 	T_RTTI_CLASS;
 
 public:
-	AnimationEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, physics::PhysicsManager* physicsManager);
-
-	virtual const TypeInfoSet getEntityTypes() const override final;
-
-	virtual const TypeInfoSet getEntityEventTypes() const override final;
+	explicit AnimationEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, physics::PhysicsManager* physicsManager);
 
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;
 
-	virtual Ref< world::Entity > createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const override final;
-
-	virtual Ref< world::IEntityEvent > createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const override final;
-
 	virtual Ref< world::IEntityComponent > createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const override final;
 
 private:

diff --git a/code/Mesh/MeshEntityFactory.cpp b/code/Mesh/MeshEntityFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
@@ -15,39 +15,19 @@
 namespace traktor::mesh
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.mesh.MeshEntityFactory", MeshEntityFactory, world::IEntityFactory)
+T_IMPLEMENT_RTTI_CLASS(L"traktor.mesh.MeshEntityFactory", MeshEntityFactory, world::AbstractEntityFactory)
 
 MeshEntityFactory::MeshEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem)
 :	m_resourceManager(resourceManager)
 ,	m_renderSystem(renderSystem)
 {
 }
 
-const TypeInfoSet MeshEntityFactory::getEntityTypes() const
-{
-	return TypeInfoSet();
-}
-
-const TypeInfoSet MeshEntityFactory::getEntityEventTypes() const
-{
-	return TypeInfoSet();
-}
-
 const TypeInfoSet MeshEntityFactory::getEntityComponentTypes() const
 {
 	return makeTypeInfoSet< MeshComponentData, MeshParameterComponentData >();
 }
 
-Ref< world::Entity > MeshEntityFactory::createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const
-{
-	return nullptr;
-}
-
-Ref< world::IEntityEvent > MeshEntityFactory::createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const
-{
-	return nullptr;
-}
-
 Ref< world::IEntityComponent > MeshEntityFactory::createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const
 {
 	if (auto meshComponentData = dynamic_type_cast< const MeshComponentData* >(&entityComponentData))

diff --git a/code/Mesh/MeshEntityFactory.h b/code/Mesh/MeshEntityFactory.h
@@ -1,14 +1,14 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
 
-#include "World/IEntityFactory.h"
+#include "World/AbstractEntityFactory.h"
 
 // import/export mechanism.
 #undef T_DLLCLASS
@@ -38,23 +38,15 @@ namespace traktor::mesh
 /*! Mesh component factory.
  * \ingroup Mesh
  */
-class T_DLLCLASS MeshEntityFactory : public world::IEntityFactory
+class T_DLLCLASS MeshEntityFactory : public world::AbstractEntityFactory
 {
 	T_RTTI_CLASS;
 
 public:
 	explicit MeshEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem);
 
-	virtual const TypeInfoSet getEntityTypes() const override final;
-
-	virtual const TypeInfoSet getEntityEventTypes() const override final;
-
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;
 
-	virtual Ref< world::Entity > createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const override final;
-
-	virtual Ref< world::IEntityEvent > createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const override final;
-
 	virtual Ref< world::IEntityComponent > createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const override final;
 
 private:

diff --git a/code/Physics/World/EntityFactory.cpp b/code/Physics/World/EntityFactory.cpp
@@ -1,6 +1,6 @@
 /*
  * TRAKTOR
- * Copyright (c) 2022 Anders Pistol.
+ * Copyright (c) 2022-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
@@ -19,7 +19,7 @@
 namespace traktor::physics
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.physics.EntityFactory", EntityFactory, world::IEntityFactory)
+T_IMPLEMENT_RTTI_CLASS(L"traktor.physics.EntityFactory", EntityFactory, world::AbstractEntityFactory)
 
 EntityFactory::EntityFactory(
 	resource::IResourceManager* resourceManager,
@@ -30,16 +30,6 @@ EntityFactory::EntityFactory(
 {
 }
 
-const TypeInfoSet EntityFactory::getEntityTypes() const
-{
-	return TypeInfoSet();
-}
-
-const TypeInfoSet EntityFactory::getEntityEventTypes() const
-{
-	return TypeInfoSet();
-}
-
 const TypeInfoSet EntityFactory::getEntityComponentTypes() const
 {
 	return makeTypeInfoSet<
@@ -50,19 +40,6 @@ const TypeInfoSet EntityFactory::getEntityComponentTypes() const
 	>();
 }
 
-Ref< world::Entity > EntityFactory::createEntity(
-	const world::IEntityBuilder* builder,
-	const world::EntityData& entityData
-) const
-{
-	return nullptr;
-}
-
-Ref< world::IEntityEvent > EntityFactory::createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const
-{
-	return nullptr;
-}
-
 Ref< world::IEntityComponent > EntityFactory::createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const
 {
 	if (auto characterComponentData = dynamic_type_cast< const CharacterComponentData* >(&entityComponentData))

diff --git a/code/Physics/World/EntityFactory.h b/code/Physics/World/EntityFactory.h
@@ -8,7 +8,7 @@
  */
 #pragma once
 
-#include "World/IEntityFactory.h"
+#include "World/AbstractEntityFactory.h"
 
 #undef T_DLLCLASS
 #if defined(T_PHYSICS_EXPORT)
@@ -32,7 +32,7 @@ class PhysicsManager;
 /*! Physics entity factory.
  * \ingroup Physics
  */
-class T_DLLCLASS EntityFactory : public world::IEntityFactory
+class T_DLLCLASS EntityFactory : public world::AbstractEntityFactory
 {
 	T_RTTI_CLASS;
 
@@ -42,16 +42,8 @@ class T_DLLCLASS EntityFactory : public world::IEntityFactory
 		PhysicsManager* physicsManager
 	);
 
-	virtual const TypeInfoSet getEntityTypes() const override final;
-
-	virtual const TypeInfoSet getEntityEventTypes() const override final;
-
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;
 
-	virtual Ref< world::Entity > createEntity(const world::IEntityBuilder* builder, const world::EntityData& entityData) const override final;
-
-	virtual Ref< world::IEntityEvent > createEntityEvent(const world::IEntityBuilder* builder, const world::IEntityEventData& entityEventData) const override final;
-
 	virtual Ref< world::IEntityComponent > createEntityComponent(const world::IEntityBuilder* builder, const world::IEntityComponentData& entityComponentData) const override final;
 
 private:

diff --git a/code/Scene/Editor/EntityAdapterBuilder.cpp b/code/Scene/Editor/EntityAdapterBuilder.cpp
@@ -128,6 +128,7 @@ Ref< world::Entity > EntityAdapterBuilder::create(const world::EntityData* entit
 	{
 		log::debug << L"Unable to create entity from \"" << type_name(entityData) << L"\"; using empty entity as placeholder." << Endl;
 		entity = new world::Entity(
+			entityData->getId(),
 			entityData->getName(),
 			entityData->getTransform(),
 			entityData->getState()
@@ -179,4 +180,9 @@ Ref< world::IEntityComponent > EntityAdapterBuilder::create(const world::IEntity
 	return entityComponent;
 }
 
+Ref< world::IWorldComponent > EntityAdapterBuilder::create(const world::IWorldComponentData* worldComponentData) const
+{
+	return m_entityFactory->createWorldComponent(this, *worldComponentData);
+}
+
 }
diff --git a/code/Scene/Editor/EntityAdapterBuilder.h b/code/Scene/Editor/EntityAdapterBuilder.h
@@ -45,6 +45,8 @@ class EntityAdapterBuilder : public world::IEntityBuilder
 
 	virtual Ref< world::IEntityComponent > create(const world::IEntityComponentData* entityComponentData) const override final;
 
+	virtual Ref< world::IWorldComponent > create(const world::IWorldComponentData* worldComponentData) const override final;
+
 	EntityAdapter* getRootAdapter() const { return m_rootAdapter; }
 
 private: