Traktor: Using IEntityFactory::initialize path in editor as well.

apistol78 · May 15, 2024 · a824c7b · a824c7b
1 parent 2c83bd4
commit a824c7b
Show file tree

Hide file tree

Showing 45 changed files with 131 additions and 155 deletions.
diff --git a/code/Ai/Editor/AiEditorProfile.cpp b/code/Ai/Editor/AiEditorProfile.cpp
@@ -50,11 +50,11 @@ void AiEditorProfile::createResourceFactories(
 
 void AiEditorProfile::createEntityFactories(
 	scene::SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
-	bool build = context->getEditor()->getSettings()->getProperty< bool >(L"NavMeshPipeline.Build", true);
-	outEntityFactories.push_back(new NavMeshEntityFactory(context->getResourceManager(), !build));
+	const bool build = context->getEditor()->getSettings()->getProperty< bool >(L"NavMeshPipeline.Build", true);
+	outEntityFactories.push_back(new NavMeshEntityFactory(!build));
 }
 
 void AiEditorProfile::createEntityRenderers(

diff --git a/code/Ai/Editor/AiEditorProfile.h b/code/Ai/Editor/AiEditorProfile.h
@@ -49,7 +49,7 @@ class T_DLLCLASS AiEditorProfile : public scene::ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		scene::SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Ai/NavMeshEntityFactory.cpp b/code/Ai/NavMeshEntityFactory.cpp
@@ -18,9 +18,8 @@ namespace traktor::ai
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.ai.NavMeshEntityFactory", 0, NavMeshEntityFactory, world::AbstractEntityFactory)
 
-NavMeshEntityFactory::NavMeshEntityFactory(resource::IResourceManager* resourceManager, bool suppress)
-:	m_resourceManager(resourceManager)
-,	m_suppress(suppress)
+NavMeshEntityFactory::NavMeshEntityFactory(bool suppress)
+:	m_suppress(suppress)
 {
 }
 

diff --git a/code/Ai/NavMeshEntityFactory.h b/code/Ai/NavMeshEntityFactory.h
@@ -38,7 +38,7 @@ class T_DLLCLASS NavMeshEntityFactory : public world::AbstractEntityFactory
 public:
 	NavMeshEntityFactory() = default;
 
-	explicit NavMeshEntityFactory(resource::IResourceManager* resourceManager, bool suppress);
+	explicit NavMeshEntityFactory(bool suppress);
 
 	virtual bool initialize(const ObjectStore& objectStore) override final;
 

diff --git a/code/Animation/AnimationEntityFactory.cpp b/code/Animation/AnimationEntityFactory.cpp
@@ -34,13 +34,6 @@ namespace traktor::animation
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.animation.AnimationEntityFactory", 0, AnimationEntityFactory, world::AbstractEntityFactory)
 
-AnimationEntityFactory::AnimationEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, physics::PhysicsManager* physicsManager)
-:	m_resourceManager(resourceManager)
-,	m_renderSystem(renderSystem)
-,	m_physicsManager(physicsManager)
-{
-}
-
 bool AnimationEntityFactory::initialize(const ObjectStore& objectStore)
 {
 	m_resourceManager = objectStore.get< resource::IResourceManager >();

diff --git a/code/Animation/AnimationEntityFactory.h b/code/Animation/AnimationEntityFactory.h
@@ -50,10 +50,6 @@ class T_DLLCLASS AnimationEntityFactory : public world::AbstractEntityFactory
 	T_RTTI_CLASS;
 
 public:
-	AnimationEntityFactory() = default;
-
-	explicit AnimationEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, physics::PhysicsManager* physicsManager);
-
 	virtual bool initialize(const ObjectStore& objectStore) override final;
 
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;

diff --git a/code/Animation/Editor/AnimationEditorProfile.cpp b/code/Animation/Editor/AnimationEditorProfile.cpp
@@ -56,10 +56,10 @@ void AnimationEditorProfile::createResourceFactories(
 
 void AnimationEditorProfile::createEntityFactories(
 	scene::SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
-	outEntityFactories.push_back(new AnimationEntityFactory(context->getResourceManager(), context->getRenderSystem(), context->getPhysicsManager()));
+	outEntityFactories.push_back(new AnimationEntityFactory());
 }
 
 void AnimationEditorProfile::createEntityRenderers(

diff --git a/code/Animation/Editor/AnimationEditorProfile.h b/code/Animation/Editor/AnimationEditorProfile.h
@@ -49,7 +49,7 @@ class T_DLLCLASS AnimationEditorProfile : public scene::ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		scene::SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Animation/Editor/AnimationPreviewControl.cpp b/code/Animation/Editor/AnimationPreviewControl.cpp
@@ -64,6 +64,11 @@ const float c_deltaMoveScale = 0.025f;
 const float c_deltaScaleHead = 0.015f;
 const float c_deltaScalePitch = 0.005f;
 
+world::IEntityFactory* initializeFactory(world::IEntityFactory* entityFactory, const ObjectStore& objectStore)
+{
+	return entityFactory->initialize(objectStore) ? entityFactory : nullptr;
+}
+
 	}
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.animation.AnimationPreviewControl", AnimationPreviewControl, ui::Widget)
@@ -91,10 +96,15 @@ bool AnimationPreviewControl::create(ui::Widget* parent)
 
 	m_resourceManager = new resource::ResourceManager(resourceDatabase, m_editor->getSettings()->getProperty< bool >(L"Resource.Verbose", false));
 
+	// Setup object store with relevant systems.
+	ObjectStore objectStore;
+	objectStore.set(m_resourceManager);
+	objectStore.set(m_renderSystem);
+
 	Ref< world::EntityFactory > entityFactory = new world::EntityFactory();
-	entityFactory->addFactory(new world::WorldEntityFactory(m_resourceManager, m_renderSystem, true));
-	entityFactory->addFactory(new weather::WeatherFactory(m_resourceManager, m_renderSystem));
-	entityFactory->addFactory(new mesh::MeshEntityFactory(m_resourceManager, m_renderSystem));
+	entityFactory->addFactory(initializeFactory(new world::WorldEntityFactory(true), objectStore));
+	entityFactory->addFactory(initializeFactory(new weather::WeatherFactory(), objectStore));
+	entityFactory->addFactory(initializeFactory(new mesh::MeshEntityFactory(), objectStore));
 
 	m_resourceManager->addFactory(new AnimationResourceFactory());
 	m_resourceManager->addFactory(new mesh::MeshResourceFactory(m_renderSystem));

diff --git a/code/Heightfield/Editor/HeightfieldEditorProfile.cpp b/code/Heightfield/Editor/HeightfieldEditorProfile.cpp
@@ -44,7 +44,7 @@ void HeightfieldEditorProfile::createResourceFactories(
 
 void HeightfieldEditorProfile::createEntityFactories(
 	scene::SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
 }

diff --git a/code/Heightfield/Editor/HeightfieldEditorProfile.h b/code/Heightfield/Editor/HeightfieldEditorProfile.h
@@ -46,7 +46,7 @@ class T_DLLCLASS HeightfieldEditorProfile : public scene::ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		scene::SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Mesh/Editor/MeshEditorProfile.cpp b/code/Mesh/Editor/MeshEditorProfile.cpp
@@ -54,10 +54,10 @@ void MeshEditorProfile::createResourceFactories(
 
 void MeshEditorProfile::createEntityFactories(
 	scene::SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
-	outEntityFactories.push_back(new mesh::MeshEntityFactory(context->getResourceManager(), context->getRenderSystem()));
+	outEntityFactories.push_back(new mesh::MeshEntityFactory());
 }
 
 void MeshEditorProfile::createEntityRenderers(

diff --git a/code/Mesh/Editor/MeshEditorProfile.h b/code/Mesh/Editor/MeshEditorProfile.h
@@ -46,7 +46,7 @@ class T_DLLCLASS MeshEditorProfile : public scene::ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		scene::SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Mesh/MeshEntityFactory.cpp b/code/Mesh/MeshEntityFactory.cpp
@@ -20,12 +20,6 @@ namespace traktor::mesh
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.mesh.MeshEntityFactory", 0, MeshEntityFactory, world::AbstractEntityFactory)
 
-MeshEntityFactory::MeshEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem)
-:	m_resourceManager(resourceManager)
-,	m_renderSystem(renderSystem)
-{
-}
-
 bool MeshEntityFactory::initialize(const ObjectStore& objectStore)
 {
 	m_resourceManager = objectStore.get< resource::IResourceManager >();

diff --git a/code/Mesh/MeshEntityFactory.h b/code/Mesh/MeshEntityFactory.h
@@ -43,10 +43,6 @@ class T_DLLCLASS MeshEntityFactory : public world::AbstractEntityFactory
 	T_RTTI_CLASS;
 
 public:
-	MeshEntityFactory() = default;
-
-	explicit MeshEntityFactory(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem);
-
 	virtual bool initialize(const ObjectStore& objectStore) override final;
 
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;

diff --git a/code/Physics/Editor/PhysicsEditorProfile.cpp b/code/Physics/Editor/PhysicsEditorProfile.cpp
@@ -51,10 +51,10 @@ void PhysicsEditorProfile::createResourceFactories(
 
 void PhysicsEditorProfile::createEntityFactories(
 	scene::SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
-	outEntityFactories.push_back(new EntityFactory(context->getResourceManager(), context->getPhysicsManager()));
+	outEntityFactories.push_back(new EntityFactory());
 }
 
 void PhysicsEditorProfile::createEntityRenderers(

diff --git a/code/Physics/Editor/PhysicsEditorProfile.h b/code/Physics/Editor/PhysicsEditorProfile.h
@@ -46,7 +46,7 @@ class T_DLLCLASS PhysicsEditorProfile : public scene::ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		scene::SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Physics/World/EntityFactory.cpp b/code/Physics/World/EntityFactory.cpp
@@ -24,15 +24,6 @@ namespace traktor::physics
 
 T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.physics.EntityFactory", 0, EntityFactory, world::AbstractEntityFactory)
 
-EntityFactory::EntityFactory(
-	resource::IResourceManager* resourceManager,
-	PhysicsManager* physicsManager
-)
-:	m_resourceManager(resourceManager)
-,	m_physicsManager(physicsManager)
-{
-}
-
 bool EntityFactory::initialize(const ObjectStore& objectStore)
 {
 	m_resourceManager = objectStore.get< resource::IResourceManager >();

diff --git a/code/Physics/World/EntityFactory.h b/code/Physics/World/EntityFactory.h
@@ -37,13 +37,6 @@ class T_DLLCLASS EntityFactory : public world::AbstractEntityFactory
 	T_RTTI_CLASS;
 
 public:
-	EntityFactory() = default;
-
-	explicit EntityFactory(
-		resource::IResourceManager* resourceManager,
-		PhysicsManager* physicsManager
-	);
-
 	virtual bool initialize(const ObjectStore& objectStore) override final;
 
 	virtual const TypeInfoSet getEntityComponentTypes() const override final;

diff --git a/code/Scene/Editor/DefaultEditorProfile.cpp b/code/Scene/Editor/DefaultEditorProfile.cpp
@@ -84,12 +84,12 @@ void DefaultEditorProfile::createResourceFactories(
 
 void DefaultEditorProfile::createEntityFactories(
 	SceneEditorContext* context,
-	RefArray< const world::IEntityFactory >& outEntityFactories
+	RefArray< world::IEntityFactory >& outEntityFactories
 ) const
 {
-	outEntityFactories.push_back(new world::WorldEntityFactory(context->getResourceManager(), context->getRenderSystem(), true));
+	outEntityFactories.push_back(new world::WorldEntityFactory(true));
 	outEntityFactories.push_back(new world::WorldEditorEntityFactory());
-	outEntityFactories.push_back(new weather::WeatherFactory(context->getResourceManager(), context->getRenderSystem()));
+	outEntityFactories.push_back(new weather::WeatherFactory());
 }
 
 void DefaultEditorProfile::createEntityRenderers(

diff --git a/code/Scene/Editor/DefaultEditorProfile.h b/code/Scene/Editor/DefaultEditorProfile.h
@@ -39,7 +39,7 @@ class DefaultEditorProfile : public ISceneEditorProfile
 
 	virtual void createEntityFactories(
 		SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const override final;
 
 	virtual void createEntityRenderers(

diff --git a/code/Scene/Editor/ISceneEditorProfile.h b/code/Scene/Editor/ISceneEditorProfile.h
@@ -124,7 +124,7 @@ class T_DLLCLASS ISceneEditorProfile : public Object
 	 */
 	virtual void createEntityFactories(
 		SceneEditorContext* context,
-		RefArray< const world::IEntityFactory >& outEntityFactories
+		RefArray< world::IEntityFactory >& outEntityFactories
 	) const = 0;
 
 	/*! Create entity renderers.

diff --git a/code/Scene/Editor/SceneEditorContext.cpp b/code/Scene/Editor/SceneEditorContext.cpp
@@ -10,12 +10,15 @@
 #include <stack>
 #include "Core/Log/Log.h"
 #include "Core/Math/Const.h"
+#include "Core/Misc/ObjectStore.h"
 #include "Core/Misc/SafeDestroy.h"
 #include "Core/Serialization/DeepClone.h"
 #include "Core/Serialization/DeepHash.h"
 #include "Core/Timer/Timer.h"
+#include "Database/Database.h"
 #include "Physics/Body.h"
 #include "Physics/PhysicsManager.h"
+#include "Render/IRenderSystem.h"
 #include "Render/ITexture.h"
 #include "Resource/IResourceManager.h"
 #include "Scene/Scene.h"
@@ -146,7 +149,7 @@ void SceneEditorContext::addEditorPlugin(ISceneEditorPlugin* editorPlugin)
 	m_editorPlugins.push_back(editorPlugin);
 }
 
-void SceneEditorContext::createFactories()
+void SceneEditorContext::createEditorFactories()
 {
 	m_entityEditorFactories.resize(0);
 	m_componentEditorFactories.resize(0);
@@ -440,14 +443,26 @@ void SceneEditorContext::buildEntities()
 
 	if (m_sceneAsset)
 	{
+		// Setup object store with relevant systems.
+		ObjectStore objectStore;
+		objectStore.set(getSourceDatabase());
+		objectStore.set(getPhysicsManager());
+		objectStore.set(getRenderSystem());
+		objectStore.set(getResourceManager());
+
 		// Create the entity factory.
 		Ref< world::EntityFactory > entityFactory = new world::EntityFactory();
 		for (auto editorProfile : m_editorProfiles)
 		{
-			RefArray< const world::IEntityFactory > entityFactories;
+			RefArray< world::IEntityFactory > entityFactories;
 			editorProfile->createEntityFactories(this, entityFactories);
 			for (auto factory : entityFactories)
-				entityFactory->addFactory(factory);
+			{
+				if (factory->initialize(objectStore))
+					entityFactory->addFactory(factory);
+				else
+					log::error << L"Failed to initialize entity factory \"" << type_name(factory) << L"\"." << Endl;
+			}
 		}
 
 		Ref< world::World > world = new world::World();
@@ -518,14 +533,26 @@ void SceneEditorContext::buildController()
 {
 	T_FATAL_ASSERT(m_scene);
 
+	// Setup object store with relevant systems.
+	ObjectStore objectStore;
+	objectStore.set(getSourceDatabase());
+	objectStore.set(getPhysicsManager());
+	objectStore.set(getRenderSystem());
+	objectStore.set(getResourceManager());
+
 	// Create the entity factory.
 	Ref< world::EntityFactory > entityFactory = new world::EntityFactory();
 	for (auto editorProfile : m_editorProfiles)
 	{
-		RefArray< const world::IEntityFactory > entityFactories;
+		RefArray< world::IEntityFactory > entityFactories;
 		editorProfile->createEntityFactories(this, entityFactories);
 		for (auto factory : entityFactories)
-			entityFactory->addFactory(factory);
+		{
+			if (factory->initialize(objectStore))
+				entityFactory->addFactory(factory);
+			else
+				log::error << L"Failed to initialize entity factory \"" << type_name(factory) << L"\"." << Endl;
+		}
 	}
 
 	// Create all world components.

diff --git a/code/Scene/Editor/SceneEditorContext.h b/code/Scene/Editor/SceneEditorContext.h
@@ -139,7 +139,7 @@ class T_DLLCLASS SceneEditorContext : public ui::EventSubject
 
 	void addEditorPlugin(ISceneEditorPlugin* editorPlugin);
 
-	void createFactories();
+	void createEditorFactories();
 
 	void setControllerEditor(IWorldComponentEditor* controllerEditor);
 

diff --git a/code/Scene/Editor/SceneEditorPage.cpp b/code/Scene/Editor/SceneEditorPage.cpp
@@ -264,16 +264,28 @@ bool SceneEditorPage::create(ui::Container* parent)
 	}
 
 	// Create entity and component editor factories.
-	m_context->createFactories();
+	m_context->createEditorFactories();
+
+	// Setup object store with relevant systems.
+	ObjectStore objectStore;
+	objectStore.set(m_context->getSourceDatabase());
+	objectStore.set(m_context->getPhysicsManager());
+	objectStore.set(m_context->getRenderSystem());
+	objectStore.set(m_context->getResourceManager());
 
 	// Create scene instance resource factory, used by final render control etc.
 	Ref< world::EntityFactory > entityFactory = new world::EntityFactory();
 	for (auto editorProfile : m_context->getEditorProfiles())
 	{
-		RefArray< const world::IEntityFactory > entityFactories;
+		RefArray< world::IEntityFactory > entityFactories;
 		editorProfile->createEntityFactories(m_context, entityFactories);
 		for (auto factory : entityFactories)
-			entityFactory->addFactory(factory);
+		{
+			if (factory->initialize(objectStore))
+				entityFactory->addFactory(factory);
+			else
+				log::error << L"Failed to initialize entity factory \"" << type_name(factory) << L"\"." << Endl;
+		}
 	}
 	m_context->getResourceManager()->addFactory(new SceneFactory(entityFactory));