Traktor: No longer able to render entities, only components. Fixed is…

…sue with Spray editor.
apistol78 · Feb 12, 2024 · ca41881 · ca41881
1 parent e3d78dd
commit ca41881
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/code/Spray/Editor/EffectPreviewControl.cpp b/code/Spray/Editor/EffectPreviewControl.cpp
@@ -190,7 +190,6 @@ void EffectPreviewControl::setEffect(const EffectData* effectData, Effect* effec
 	{
 		m_effectEntity = new world::Entity();
 		m_effectEntity->setComponent(new EffectComponent(resource::Proxy< Effect >(m_effect)));
-		m_effectEntity->update({});
 	}
 	else
 		m_effectEntity = nullptr;

diff --git a/code/Spray/EffectLayerInstance.cpp b/code/Spray/EffectLayerInstance.cpp
@@ -89,7 +89,11 @@ void EffectLayerInstance::update(Context& context, const Transform& transform, f
 			m_sequenceInstance->update(context, transform, time - m_start, enable);
 	}
 
-	if (enable != m_enable)
+	if (
+		enable != m_enable &&
+		context.owner != nullptr &&
+		context.owner->getWorld() != nullptr
+	)
 	{
 		auto eventManager = context.owner->getWorld()->getComponent< world::EntityEventManager >();
 		if (eventManager)

diff --git a/code/World/Shared/WorldRendererShared.cpp b/code/World/Shared/WorldRendererShared.cpp
@@ -228,9 +228,10 @@ void WorldRendererShared::gather(const World* world, const std::function< bool(c
 		else if (filter == nullptr && entity->getState().visible == false)
 			continue;
 
-		IEntityRenderer* entityRenderer = m_entityRenderers->find(type_of(entity));
-		if (entityRenderer)
-			m_gatheredView.renderables.push_back({ entityRenderer, entity });
+		//#todo No longer allow entities to be rendered.
+		//IEntityRenderer* entityRenderer = m_entityRenderers->find(type_of(entity));
+		//if (entityRenderer)
+		//	m_gatheredView.renderables.push_back({ entityRenderer, entity });
 
 		for (auto component : entity->getComponents())
 		{