Traktor: Renamed EntityEventManager to EventManagerComponent and move…

…d it into World/Entity folder.
apistol78 · May 16, 2024 · b51fd06 · b51fd06
1 parent 6620b87
commit b51fd06
Show file tree

Hide file tree

Showing 37 changed files with 95 additions and 68 deletions.
diff --git a/code/Animation/Editor/AnimationPreviewControl.cpp b/code/Animation/Editor/AnimationPreviewControl.cpp
@@ -113,7 +113,7 @@ bool AnimationPreviewControl::create(ui::Widget* parent)
 	m_resourceManager->addFactory(new render::ShaderFactory(m_renderSystem));
 	m_resourceManager->addFactory(new render::TextureFactory(m_renderSystem, 0));
 	m_resourceManager->addFactory(new render::ImageGraphFactory(m_renderSystem));
-	m_resourceManager->addFactory(new scene::SceneFactory(entityFactory));
+	m_resourceManager->addFactory(new scene::SceneFactory(m_renderSystem, entityFactory));
 	m_resourceManager->addFactory(new world::WorldResourceFactory(m_renderSystem, nullptr));
 
 	render::RenderViewEmbeddedDesc desc;

diff --git a/code/Physics/World/RigidBodyComponent.cpp b/code/Physics/World/RigidBodyComponent.cpp
@@ -12,7 +12,7 @@
 #include "Physics/World/RigidBodyComponent.h"
 #include "World/Entity.h"
 #include "World/World.h"
-#include "World/EntityEventManager.h"
+#include "World/Entity/EventManagerComponent.h"
 
 namespace traktor::physics
 {
@@ -85,7 +85,7 @@ void RigidBodyComponent::collisionListener(const physics::CollisionInfo& collisi
 	if (m_owner->getWorld() == nullptr)
 		return;
 
-	world::EntityEventManager* eventManager = m_owner->getWorld()->getComponent< world::EntityEventManager >();
+	world::EventManagerComponent* eventManager = m_owner->getWorld()->getComponent< world::EventManagerComponent >();
 	if (!eventManager)
 		return;
 

diff --git a/code/Runtime/Engine/SplitWorldLayer.cpp b/code/Runtime/Engine/SplitWorldLayer.cpp
@@ -264,7 +264,7 @@ void SplitWorldLayer::setup(const UpdateInfo& info, render::RenderGraph& renderG
 	//auto group = m_rootGroup->getComponent< world::GroupComponent >();
 	//group->removeAllEntities();
 
-	//world::EntityEventManager* eventManager = m_environment->getWorld()->getEntityEventManager();
+	//world::EventManagerComponent* eventManager = m_environment->getWorld()->getEntityEventManager();
 	//if (eventManager)
 	//	eventManager->gather([&](world::Entity* entity) { group->addEntity(entity); });
 

diff --git a/code/Runtime/GameClassFactory.cpp b/code/Runtime/GameClassFactory.cpp
@@ -52,7 +52,6 @@
 #include "World/Entity.h"
 #include "World/EntityData.h"
 #include "World/IEntityBuilder.h"
-#include "World/EntityEventManager.h"
 #include "World/IEntityFactory.h"
 #include "World/IEntityRenderer.h"
 #include "World/IWorldRenderer.h"

diff --git a/code/Runtime/Impl/Application.cpp b/code/Runtime/Impl/Application.cpp
@@ -56,7 +56,6 @@
 #include "Render/IRenderView.h"
 #include "Resource/IResourceManager.h"
 #include "Script/IScriptManager.h"
-#include "World/EntityEventManager.h"
 
 namespace traktor::runtime
 {

diff --git a/code/Runtime/Impl/WorldServer.cpp b/code/Runtime/Impl/WorldServer.cpp
@@ -32,7 +32,6 @@
 #include "Weather/Precipitation/PrecipitationRenderer.h"
 #include "Weather/Sky/SkyRenderer.h"
 #include "World/EntityFactory.h"
-#include "World/EntityEventManager.h"
 #include "World/IWorldRenderer.h"
 #include "World/WorldEntityRenderers.h"
 #include "World/WorldResourceFactory.h"
@@ -123,7 +122,7 @@ void WorldServer::createResourceFactories(IEnvironment* environment)
 	resource::IResourceManager* resourceManager = environment->getResource()->getResourceManager();
 	render::IRenderSystem* renderSystem = environment->getRender()->getRenderSystem();
 
-	resourceManager->addFactory(new scene::SceneFactory(m_entityFactory));
+	resourceManager->addFactory(new scene::SceneFactory(renderSystem, m_entityFactory));
 	resourceManager->addFactory(new world::WorldResourceFactory(renderSystem, m_entityFactory));
 }
 

diff --git a/code/Scene/Editor/RenderControls/CameraRenderControl.cpp b/code/Scene/Editor/RenderControls/CameraRenderControl.cpp
@@ -44,7 +44,6 @@
 #include "Ui/AspectLayout.h"
 #include "Ui/Itf/IWidget.h"
 #include "World/Entity.h"
-#include "World/EntityEventManager.h"
 #include "World/IWorldRenderer.h"
 #include "World/WorldEntityRenderers.h"
 #include "World/WorldRenderSettings.h"

diff --git a/code/Scene/Editor/RenderControls/FinalRenderControl.cpp b/code/Scene/Editor/RenderControls/FinalRenderControl.cpp
@@ -38,7 +38,6 @@
 #include "Ui/AspectLayout.h"
 #include "Ui/Itf/IWidget.h"
 #include "World/Entity.h"
-#include "World/EntityEventManager.h"
 #include "World/IWorldRenderer.h"
 #include "World/WorldEntityRenderers.h"
 #include "World/WorldRenderSettings.h"

diff --git a/code/Scene/Editor/RenderControls/OrthogonalRenderControl.cpp b/code/Scene/Editor/RenderControls/OrthogonalRenderControl.cpp
@@ -37,7 +37,6 @@
 #include "Ui/Widget.h"
 #include "Ui/Itf/IWidget.h"
 #include "World/Entity.h"
-#include "World/EntityEventManager.h"
 #include "World/IWorldRenderer.h"
 #include "World/WorldEntityRenderers.h"
 #include "World/WorldRenderSettings.h"

diff --git a/code/Scene/Editor/RenderControls/PerspectiveRenderControl.cpp b/code/Scene/Editor/RenderControls/PerspectiveRenderControl.cpp
@@ -48,7 +48,6 @@
 #include "Ui/AspectLayout.h"
 #include "Ui/Itf/IWidget.h"
 #include "World/Entity.h"
-#include "World/EntityEventManager.h"
 #include "World/IWorldRenderer.h"
 #include "World/WorldEntityRenderers.h"
 #include "World/WorldRenderSettings.h"

diff --git a/code/Scene/Editor/SceneEditorContext.cpp b/code/Scene/Editor/SceneEditorContext.cpp
@@ -48,10 +48,9 @@
 #include "World/Entity.h"
 #include "World/EntityBuilder.h"
 #include "World/EntityData.h"
-#include "World/EntityEventManager.h"
 #include "World/EntityFactory.h"
 #include "World/World.h"
-#include "World/Entity/CullingComponent.h"
+#include "World/Entity/EventManagerComponent.h"
 #include "World/Entity/GroupComponent.h"
 
 namespace traktor::scene
@@ -437,7 +436,7 @@ void SceneEditorContext::buildEntities()
 	// Cancel all events.
 	if (m_scene)
 	{
-		auto eventManager = m_scene->getWorld()->getComponent< world::EntityEventManager >();
+		auto eventManager = m_scene->getWorld()->getComponent< world::EventManagerComponent >();
 		if (eventManager != nullptr)
 			eventManager->cancelAll(world::Cancel::Immediate);
 	}
@@ -466,10 +465,7 @@ void SceneEditorContext::buildEntities()
 			}
 		}
 
-		Ref< world::World > world = new world::World();
-
-		// #fixme How should we create this?
-		world->setComponent(new world::CullingComponent(m_resourceManager, m_renderSystem));
+		Ref< world::World > world = new world::World(getResourceManager(), getRenderSystem());
 
 		// Create world components.
 		for (auto worldComponentData : m_sceneAsset->getWorldComponents())

diff --git a/code/Scene/Editor/SceneEditorPage.cpp b/code/Scene/Editor/SceneEditorPage.cpp
@@ -287,7 +287,7 @@ bool SceneEditorPage::create(ui::Container* parent)
 				log::error << L"Failed to initialize entity factory \"" << type_name(factory) << L"\"." << Endl;
 		}
 	}
-	m_context->getResourceManager()->addFactory(new SceneFactory(entityFactory));
+	m_context->getResourceManager()->addFactory(new SceneFactory(m_context->getRenderSystem(), entityFactory));
 
 	// Create editor panel.
 	m_editPanel = new ui::Container();

diff --git a/code/Scene/Editor/ScenePreviewControl.cpp b/code/Scene/Editor/ScenePreviewControl.cpp
@@ -47,7 +47,6 @@
 #include "Ui/StatusBar/StatusBar.h"
 #include "Ui/Splitter.h"
 #include "Ui/QuadSplitter.h"
-#include "World/EntityEventManager.h"
 
 namespace traktor::scene
 {

diff --git a/code/Scene/SceneFactory.cpp b/code/Scene/SceneFactory.cpp
@@ -18,8 +18,9 @@ namespace traktor::scene
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.scene.SceneFactory", SceneFactory, resource::IResourceFactory)
 
-SceneFactory::SceneFactory(const world::IEntityFactory* entityFactory)
-:	m_entityFactory(entityFactory)
+SceneFactory::SceneFactory(render::IRenderSystem* renderSystem, const world::IEntityFactory* entityFactory)
+:	m_renderSystem(renderSystem)
+,	m_entityFactory(entityFactory)
 {
 }
 
@@ -47,7 +48,7 @@ Ref< Object > SceneFactory::create(resource::IResourceManager* resourceManager,
 {
 	Ref< const SceneResource > sceneResource = instance->getObject< SceneResource >();
 	if (sceneResource)
-		return sceneResource->createScene(m_entityFactory);
+		return sceneResource->createScene(resourceManager, m_renderSystem, m_entityFactory);
 	else
 		return nullptr;
 }

diff --git a/code/Scene/SceneFactory.h b/code/Scene/SceneFactory.h
@@ -19,6 +19,13 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
+namespace traktor::render
+{
+
+class IRenderSystem;
+
+}
+
 namespace traktor::world
 {
 
@@ -40,7 +47,7 @@ class T_DLLCLASS SceneFactory : public resource::IResourceFactory
 	SceneFactory() = default;
 
 	/*! Construct scene factory. */
-	explicit SceneFactory(const world::IEntityFactory* entityFactory);
+	explicit SceneFactory(render::IRenderSystem* renderSystem, const world::IEntityFactory* entityFactory);
 
 	virtual bool initialize(const ObjectStore& objectStore) override final;
 
@@ -53,6 +60,7 @@ class T_DLLCLASS SceneFactory : public resource::IResourceFactory
 	virtual Ref< Object > create(resource::IResourceManager* resourceManager, const db::Database* database, const db::Instance* instance, const TypeInfo& productType, const Object* current) const override final;
 
 private:
+	Ref< render::IRenderSystem > m_renderSystem;
 	Ref< const world::IEntityFactory > m_entityFactory;
 };
 

diff --git a/code/Scene/SceneResource.cpp b/code/Scene/SceneResource.cpp
@@ -28,9 +28,9 @@ SceneResource::SceneResource()
 {
 }
 
-Ref< Scene > SceneResource::createScene(const world::IEntityFactory* entityFactory) const
+Ref< Scene > SceneResource::createScene(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, const world::IEntityFactory* entityFactory) const
 {
-	Ref< world::World > world = new world::World();
+	Ref< world::World > world = new world::World(resourceManager, renderSystem);
 	Ref< world::EntityBuilder > entityBuilder = new world::EntityBuilder(entityFactory, world);
 
 	// Create world components.

diff --git a/code/Scene/SceneResource.h b/code/Scene/SceneResource.h
@@ -21,6 +21,20 @@
 #	define T_DLLCLASS T_DLLIMPORT
 #endif
 
+namespace traktor::resource
+{
+
+class IResourceManager;
+
+}
+
+namespace traktor::render
+{
+
+class IRenderSystem;
+
+}
+
 namespace traktor::world
 {
 
@@ -46,7 +60,7 @@ class T_DLLCLASS SceneResource : public ISerializable
 public:
 	SceneResource();
 
-	Ref< Scene > createScene(const world::IEntityFactory* entityFactory) const;
+	Ref< Scene > createScene(resource::IResourceManager* resourceManager, render::IRenderSystem* renderSystem, const world::IEntityFactory* entityFactory) const;
 
 	void setWorldRenderSettings(world::WorldRenderSettings* worldRenderSettings);
 

diff --git a/code/Spray/Editor/EffectEditorPage.cpp b/code/Spray/Editor/EffectEditorPage.cpp
@@ -156,7 +156,7 @@ bool EffectEditorPage::create(ui::Container* parent)
 	m_resourceManager->addFactory(new render::ImageGraphFactory(renderSystem));
 	m_resourceManager->addFactory(new render::ShaderFactory(renderSystem));
 	m_resourceManager->addFactory(new render::TextureFactory(renderSystem, 0));
-	m_resourceManager->addFactory(new scene::SceneFactory(entityFactory));
+	m_resourceManager->addFactory(new scene::SceneFactory(renderSystem, entityFactory));
 	m_resourceManager->addFactory(new sound::AudioResourceFactory());
 	m_resourceManager->addFactory(new world::WorldResourceFactory(renderSystem, nullptr));
 	m_resourceManager->addFactory(new EffectFactory(nullptr));

diff --git a/code/Spray/EffectLayerInstance.cpp b/code/Spray/EffectLayerInstance.cpp
@@ -14,8 +14,8 @@
 #include "World/Entity.h"
 #include "World/IEntityEvent.h"
 #include "World/IEntityEventInstance.h"
-#include "World/EntityEventManager.h"
 #include "World/World.h"
+#include "World/Entity/EventManagerComponent.h"
 
 namespace traktor::spray
 {
@@ -95,7 +95,7 @@ void EffectLayerInstance::update(Context& context, const Transform& transform, f
 		context.owner->getWorld() != nullptr
 	)
 	{
-		auto eventManager = context.owner->getWorld()->getComponent< world::EntityEventManager >();
+		auto eventManager = context.owner->getWorld()->getComponent< world::EventManagerComponent >();
 		if (eventManager)
 		{
 			if (m_triggerInstance)

diff --git a/code/Spray/Feedback/EnvelopeFeedbackEvent.cpp b/code/Spray/Feedback/EnvelopeFeedbackEvent.cpp
@@ -19,7 +19,7 @@ EnvelopeFeedbackEvent::EnvelopeFeedbackEvent(const EnvelopeFeedbackEventData* da
 {
 }
 
-Ref< world::IEntityEventInstance > EnvelopeFeedbackEvent::createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const
+Ref< world::IEntityEventInstance > EnvelopeFeedbackEvent::createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const
 {
 	return new EnvelopeFeedbackEventInstance(m_data);
 }

diff --git a/code/Spray/Feedback/EnvelopeFeedbackEvent.h b/code/Spray/Feedback/EnvelopeFeedbackEvent.h
@@ -22,7 +22,7 @@ class EnvelopeFeedbackEvent : public world::IEntityEvent
 public:
 	explicit EnvelopeFeedbackEvent(const EnvelopeFeedbackEventData* data);
 
-	virtual Ref< world::IEntityEventInstance > createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
+	virtual Ref< world::IEntityEventInstance > createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
 
 private:
 	Ref< const EnvelopeFeedbackEventData > m_data;

diff --git a/code/Spray/Feedback/OscillateFeedbackEvent.cpp b/code/Spray/Feedback/OscillateFeedbackEvent.cpp
@@ -19,7 +19,7 @@ OscillateFeedbackEvent::OscillateFeedbackEvent(const OscillateFeedbackEventData*
 {
 }
 
-Ref< world::IEntityEventInstance > OscillateFeedbackEvent::createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const
+Ref< world::IEntityEventInstance > OscillateFeedbackEvent::createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const
 {
 	return new OscillateFeedbackEventInstance(m_data);
 }

diff --git a/code/Spray/Feedback/OscillateFeedbackEvent.h b/code/Spray/Feedback/OscillateFeedbackEvent.h
@@ -22,7 +22,7 @@ class OscillateFeedbackEvent : public world::IEntityEvent
 public:
 	explicit OscillateFeedbackEvent(const OscillateFeedbackEventData* data);
 
-	virtual Ref< world::IEntityEventInstance > createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
+	virtual Ref< world::IEntityEventInstance > createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
 
 private:
 	Ref< const OscillateFeedbackEventData > m_data;

diff --git a/code/Spray/SequenceInstance.cpp b/code/Spray/SequenceInstance.cpp
@@ -8,7 +8,7 @@
  */
 #include "Spray/Sequence.h"
 #include "Spray/SequenceInstance.h"
-#include "World/EntityEventManager.h"
+#include "World/Entity/EventManagerComponent.h"
 
 namespace traktor::spray
 {

diff --git a/code/Spray/SoundEvent.cpp b/code/Spray/SoundEvent.cpp
@@ -29,7 +29,7 @@ SoundEvent::SoundEvent(
 {
 }
 
-Ref< world::IEntityEventInstance > SoundEvent::createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const
+Ref< world::IEntityEventInstance > SoundEvent::createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const
 {
 	if (m_soundPlayer)
 		return new SoundEventInstance(sender, Toffset, m_soundPlayer, m_sound, m_positional, m_follow, m_autoStopFar);

diff --git a/code/Spray/SoundEvent.h b/code/Spray/SoundEvent.h
@@ -38,7 +38,7 @@ class SoundEvent : public world::IEntityEvent
 		bool autoStopFar
 	);
 
-	virtual Ref< world::IEntityEventInstance > createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
+	virtual Ref< world::IEntityEventInstance > createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
 
 private:
 	sound::ISoundPlayer* m_soundPlayer;

diff --git a/code/Spray/SpawnEffectEvent.cpp b/code/Spray/SpawnEffectEvent.cpp
@@ -29,7 +29,7 @@ SpawnEffectEvent::SpawnEffectEvent(
 {
 }
 
-Ref< world::IEntityEventInstance > SpawnEffectEvent::createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const
+Ref< world::IEntityEventInstance > SpawnEffectEvent::createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const
 {
 	Ref< EffectComponent > effectComponent = new EffectComponent(m_effect);
 	return new SpawnEffectEventInstance(this, sender->getWorld(), sender, Toffset * m_transform, effectComponent);

diff --git a/code/Spray/SpawnEffectEvent.h b/code/Spray/SpawnEffectEvent.h
@@ -32,7 +32,7 @@ class SpawnEffectEvent : public world::IEntityEvent
 		bool useRotation
 	);
 
-	virtual Ref< world::IEntityEventInstance > createInstance(world::EntityEventManager* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
+	virtual Ref< world::IEntityEventInstance > createInstance(world::EventManagerComponent* eventManager, world::Entity* sender, const Transform& Toffset) const override final;
 
 private:
 	friend class SpawnEffectEventInstance;

diff --git a/code/World/Entity/DecalEvent.cpp b/code/World/Entity/DecalEvent.cpp
@@ -15,7 +15,7 @@ namespace traktor::world
 
 T_IMPLEMENT_RTTI_CLASS(L"traktor.world.DecalEvent", DecalEvent, IEntityEvent)
 
-Ref< IEntityEventInstance > DecalEvent::createInstance(EntityEventManager* eventManager, Entity* sender, const Transform& Toffset) const
+Ref< IEntityEventInstance > DecalEvent::createInstance(EventManagerComponent* eventManager, Entity* sender, const Transform& Toffset) const
 {
 	const Transform T = sender->getTransform() * Toffset;
 	return new DecalEventInstance(this, sender->getWorld(), T);

diff --git a/code/World/Entity/DecalEvent.h b/code/World/Entity/DecalEvent.h
@@ -30,7 +30,7 @@ class DecalEvent : public IEntityEvent
 	T_RTTI_CLASS;
 
 public:
-	virtual Ref< IEntityEventInstance > createInstance(EntityEventManager* eventManager, Entity* sender, const Transform& Toffset) const override final;
+	virtual Ref< IEntityEventInstance > createInstance(EventManagerComponent* eventManager, Entity* sender, const Transform& Toffset) const override final;
 
 	const Vector2& getSize() const { return m_size; }