Traktor: Runtime dynamically create IResourceFactory instances.

code/Ai/NavMeshFactory.cpp

@@ -18,7 +18,12 @@
 namespace traktor::ai
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.ai.NavMeshFactory", NavMeshFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.ai.NavMeshFactory", 0, NavMeshFactory, resource::IResourceFactory)
+
+bool NavMeshFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet NavMeshFactory::getResourceTypes() const
 {

code/Ai/NavMeshFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS NavMeshFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Animation/AnimationResourceFactory.cpp

@@ -17,7 +17,12 @@
 namespace traktor::animation
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.animation.AnimationResourceFactory", AnimationResourceFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.animation.AnimationResourceFactory", 0, AnimationResourceFactory, resource::IResourceFactory)
+
+bool AnimationResourceFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet AnimationResourceFactory::getResourceTypes() const
 {

code/Animation/AnimationResourceFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS AnimationResourceFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Heightfield/HeightfieldFactory.cpp

@@ -16,7 +16,12 @@
 namespace traktor::hf
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.hf.HeightfieldFactory", HeightfieldFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.hf.HeightfieldFactory", 0, HeightfieldFactory, resource::IResourceFactory)
+
+bool HeightfieldFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet HeightfieldFactory::getResourceTypes() const
 {

code/Heightfield/HeightfieldFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS HeightfieldFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Input/RumbleEffectFactory.cpp

@@ -13,7 +13,12 @@
 namespace traktor::input
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.input.RumbleEffectFactory", RumbleEffectFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.input.RumbleEffectFactory", 0, RumbleEffectFactory, resource::IResourceFactory)
+
+bool RumbleEffectFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet RumbleEffectFactory::getResourceTypes() const
 {

code/Input/RumbleEffectFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS RumbleEffectFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Mesh/MeshResourceFactory.cpp

@@ -9,16 +9,18 @@
 #include "Compress/Lzf/InflateStreamLzf.h"
 #include "Core/Io/IStream.h"
 #include "Core/Log/Log.h"
+#include "Core/Misc/ObjectStore.h"
 #include "Database/Instance.h"
 #include "Mesh/IMesh.h"
 #include "Mesh/MeshResource.h"
 #include "Mesh/MeshResourceFactory.h"
+#include "Render/IRenderSystem.h"
 #include "Render/Mesh/RenderMeshFactory.h"
 
 namespace traktor::mesh
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.mesh.MeshResourceFactory", MeshResourceFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.mesh.MeshResourceFactory", 0, MeshResourceFactory, resource::IResourceFactory)
 
 MeshResourceFactory::MeshResourceFactory(render::IRenderSystem* renderSystem, render::MeshFactory* meshFactory)
 :	m_renderSystem(renderSystem)
@@ -28,6 +30,17 @@ MeshResourceFactory::MeshResourceFactory(render::IRenderSystem* renderSystem, re
 		m_meshFactory = new render::RenderMeshFactory(m_renderSystem);
 }
 
+bool MeshResourceFactory::initialize(const ObjectStore& objectStore)
+{
+	m_renderSystem = objectStore.get< render::IRenderSystem >();
+	m_meshFactory = objectStore.get< render::MeshFactory >();
+
+	if (!m_meshFactory)
+		m_meshFactory = new render::RenderMeshFactory(m_renderSystem);
+
+	return true;
+}
+
 const TypeInfoSet MeshResourceFactory::getResourceTypes() const
 {
 	return makeTypeInfoSet< MeshResource >();

code/Mesh/MeshResourceFactory.h

@@ -37,8 +37,12 @@ class T_DLLCLASS MeshResourceFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	MeshResourceFactory() = default;
+
 	explicit MeshResourceFactory(render::IRenderSystem* renderSystem, render::MeshFactory* meshFactory = nullptr);
 
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Physics/PhysicsFactory.cpp

@@ -16,7 +16,12 @@
 namespace traktor::physics
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.physics.PhysicsFactory", PhysicsFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.physics.PhysicsFactory", 0, PhysicsFactory, resource::IResourceFactory)
+
+bool PhysicsFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet PhysicsFactory::getResourceTypes() const
 {

code/Physics/PhysicsFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS PhysicsFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Render/Image2/ImageGraphFactory.cpp

@@ -6,21 +6,29 @@
  * 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 "Core/Misc/ObjectStore.h"
 #include "Database/Instance.h"
+#include "Render/IRenderSystem.h"
 #include "Render/Image2/ImageGraph.h"
 #include "Render/Image2/ImageGraphData.h"
 #include "Render/Image2/ImageGraphFactory.h"
 
 namespace traktor::render
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.render.ImageGraphFactory", ImageGraphFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.render.ImageGraphFactory", 0, ImageGraphFactory, resource::IResourceFactory)
 
 ImageGraphFactory::ImageGraphFactory(IRenderSystem* renderSystem)
 :	m_renderSystem(renderSystem)
 {
 }
 
+bool ImageGraphFactory::initialize(const ObjectStore& objectStore)
+{
+	m_renderSystem = objectStore.get< IRenderSystem >();
+	return true;
+}
+
 const TypeInfoSet ImageGraphFactory::getResourceTypes() const
 {
 	return makeTypeInfoSet< ImageGraphData >();

code/Render/Image2/ImageGraphFactory.h

@@ -32,8 +32,12 @@ class T_DLLCLASS ImageGraphFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	ImageGraphFactory() = default;
+
 	explicit ImageGraphFactory(IRenderSystem* renderSystem);
 
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Render/Resource/AliasTextureFactory.cpp

@@ -15,7 +15,12 @@
 namespace traktor::render
 {
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.render.AliasTextureFactory", AliasTextureFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.render.AliasTextureFactory", 0, AliasTextureFactory, resource::IResourceFactory)
+
+bool AliasTextureFactory::initialize(const ObjectStore& objectStore)
+{
+	return true;
+}
 
 const TypeInfoSet AliasTextureFactory::getResourceTypes() const
 {

code/Render/Resource/AliasTextureFactory.h

@@ -29,6 +29,8 @@ class T_DLLCLASS AliasTextureFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Render/Resource/ShaderFactory.cpp

@@ -7,6 +7,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 #include "Core/Log/Log.h"
+#include "Core/Misc/ObjectStore.h"
 #include "Database/Instance.h"
 #include "Render/IProgram.h"
 #include "Render/IRenderSystem.h"
@@ -51,13 +52,19 @@ class TextureReaderAdapter : public TextureLinker::TextureReader
 
 	}
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.render.ShaderFactory", ShaderFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.render.ShaderFactory", 0, ShaderFactory, resource::IResourceFactory)
 
 ShaderFactory::ShaderFactory(IRenderSystem* renderSystem)
 :	m_renderSystem(renderSystem)
 {
 }
 
+bool ShaderFactory::initialize(const ObjectStore& objectStore)
+{
+	m_renderSystem = objectStore.get< IRenderSystem >();
+	return true;
+}
+
 const TypeInfoSet ShaderFactory::getResourceTypes() const
 {
 	return makeTypeInfoSet< ShaderResource >();

code/Render/Resource/ShaderFactory.h

@@ -31,8 +31,12 @@ class T_DLLCLASS ShaderFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	ShaderFactory() = default;
+
 	explicit ShaderFactory(IRenderSystem* renderSystem);
 
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;

code/Render/Resource/TextureFactory.cpp

@@ -11,6 +11,7 @@
 #include "Core/Io/Reader.h"
 #include "Core/Log/Log.h"
 #include "Core/Misc/AutoPtr.h"
+#include "Core/Misc/ObjectStore.h"
 #include "Database/Instance.h"
 #include "Render/IRenderSystem.h"
 #include "Render/Resource/TextureFactory.h"
@@ -35,7 +36,7 @@ uint32_t mipChainSize(TextureFormat format, int width, int height, int mipCount)
 
 	}
 
-T_IMPLEMENT_RTTI_CLASS(L"traktor.render.TextureFactory", TextureFactory, resource::IResourceFactory)
+T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.render.TextureFactory", 0, TextureFactory, resource::IResourceFactory)
 
 TextureFactory::TextureFactory(IRenderSystem* renderSystem, int32_t skipMips)
 :	m_renderSystem(renderSystem)
@@ -53,6 +54,12 @@ int32_t TextureFactory::getSkipMips() const
 	return m_skipMips;
 }
 
+bool TextureFactory::initialize(const ObjectStore& objectStore)
+{
+	m_renderSystem = objectStore.get< IRenderSystem >();
+	return true;
+}
+
 const TypeInfoSet TextureFactory::getResourceTypes() const
 {
 	return makeTypeInfoSet< TextureResource >();

code/Render/Resource/TextureFactory.h

@@ -31,12 +31,16 @@ class T_DLLCLASS TextureFactory : public resource::IResourceFactory
 	T_RTTI_CLASS;
 
 public:
+	TextureFactory() = default;
+
 	explicit TextureFactory(IRenderSystem* renderSystem, int32_t skipMips);
 
 	void setSkipMips(int32_t skipMips);
 
 	int32_t getSkipMips() const;
 
+	virtual bool initialize(const ObjectStore& objectStore) override final;
+
 	virtual const TypeInfoSet getResourceTypes() const override final;
 
 	virtual const TypeInfoSet getProductTypes(const TypeInfo& resourceType) const override final;
@@ -47,7 +51,7 @@ class T_DLLCLASS TextureFactory : public resource::IResourceFactory
 
 private:
 	Ref< IRenderSystem > m_renderSystem;
-	int32_t m_skipMips;
+	int32_t m_skipMips = 0;
 };
 
 }

code/Resource/IResourceFactory.h

@@ -20,6 +20,13 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
+namespace traktor
+{
+
+class ObjectStore;
+
+}
+
 namespace traktor::db
 {
 
@@ -48,6 +55,9 @@ class T_DLLCLASS IResourceFactory : public Object
 	T_RTTI_CLASS;
 
 public:
+	/*! */
+	virtual bool initialize(const ObjectStore& objectStore) = 0;
+
 	/*! Get resource types.
 	 *
 	 * Return a set of resource types this factory

code/Runtime/IWorldServer.h

@@ -58,7 +58,7 @@ class T_DLLCLASS IWorldServer : public IServer
 
 	virtual void removeEntityRenderer(world::IEntityRenderer* entityRenderer) = 0;
 
-	virtual const world::IEntityFactory* getEntityFactory() = 0;
+	virtual world::IEntityFactory* getEntityFactory() = 0;
 
 	virtual world::WorldEntityRenderers* getEntityRenderers() = 0;
 

code/Runtime/Impl/Application.cpp

@@ -277,12 +277,6 @@ bool Application::create(
 
 	// Resource factories
 	T_DEBUG(L"Creating resource factories...");
-	if (m_audioServer)
-		m_audioServer->createResourceFactories(m_environment);
-	if (m_inputServer)
-		m_inputServer->createResourceFactories(m_environment);
-	if (m_physicsServer)
-		m_physicsServer->createResourceFactories(m_environment);
 	if (m_renderServer)
 		m_renderServer->createResourceFactories(m_environment);
 	if (m_resourceServer)
@@ -296,8 +290,6 @@ bool Application::create(
 	T_DEBUG(L"Creating entity factories...");
 	if (m_worldServer)
 		m_worldServer->createEntityFactories(m_environment);
-	if (m_worldServer && m_physicsServer)
-		m_physicsServer->createEntityFactories(m_environment);
 
 	// Entity renderers.
 	T_DEBUG(L"Creating entity renderers...");