Render: Fixed handling of nodes removed from culler.

DragonJoker · Apr 5, 2024 · 91aecb0 · 91aecb0
1 parent e61c95d
commit 91aecb0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/include/Core/Castor3D/Render/Culling/SceneCuller.hpp b/include/Core/Castor3D/Render/Culling/SceneCuller.hpp
@@ -107,6 +107,8 @@ namespace castor3d
 		mutable SceneCullerSignal onCompute;
 		mutable SceneCullerSubmeshSignal onSubmeshChanged;
 		mutable SceneCullerBillboardSignal onBillboardChanged;
+		mutable SceneCullerSubmeshSignal onSubmeshRemoved;
+		mutable SceneCullerBillboardSignal onBillboardRemoved;
 
 	private:
 		void doInitialiseCulled();

diff --git a/include/Core/Castor3D/Render/Node/QueueRenderNodes.hpp b/include/Core/Castor3D/Render/Node/QueueRenderNodes.hpp
@@ -182,7 +182,9 @@ namespace castor3d
 		PipelineNodesBuffer m_pipelinesNodes;
 
 		SceneCullerSubmeshSignalConnection m_onSubmeshChanged;
+		SceneCullerSubmeshSignalConnection m_onSubmeshRemoved;
 		SceneCullerBillboardSignalConnection m_onBillboardChanged;
+		SceneCullerBillboardSignalConnection m_onBillboardRemoved;
 
 		castor::UnorderedSet< CulledNodeT< SubmeshRenderNode > const * > m_pendingSubmeshes;
 		castor::UnorderedSet< CulledNodeT< BillboardRenderNode > const * > m_pendingBillboards;

diff --git a/source/Core/Castor3D/Render/Culling/SceneCuller.cpp b/source/Core/Castor3D/Render/Culling/SceneCuller.cpp
@@ -179,6 +179,7 @@ namespace castor3d
 
 		if ( m_culledSubmeshes.end() != it )
 		{
+			onSubmeshRemoved( *this, **it, false );
 			m_culledSubmeshes.erase( it );
 		}
 	}
@@ -194,6 +195,7 @@ namespace castor3d
 
 		if ( m_culledBillboards.end() != it )
 		{
+			onBillboardRemoved( *this, **it, false );
 			m_culledBillboards.erase( it );
 		}
 	}

diff --git a/source/Core/Castor3D/Render/Node/QueueRenderNodes.cpp b/source/Core/Castor3D/Render/Node/QueueRenderNodes.cpp
@@ -784,12 +784,24 @@ namespace castor3d
 			{
 				doAddSubmesh( node );
 			} ) }
+		, m_onSubmeshRemoved{ queue.getCuller().onSubmeshRemoved.connect( [this]( SceneCuller const &
+				, CulledNodeT< SubmeshRenderNode > const & node
+				, bool )
+			{
+				doRemoveSubmesh( node );
+			} ) }
 		, m_onBillboardChanged{ queue.getCuller().onBillboardChanged.connect( [this]( SceneCuller const &
 				, CulledNodeT< BillboardRenderNode > const & node
 				, bool )
 			{
 				doAddBillboard( node );
 			} ) }
+		, m_onBillboardRemoved{ queue.getCuller().onBillboardRemoved.connect( [this]( SceneCuller const &
+				, CulledNodeT< BillboardRenderNode > const & node
+				, bool )
+			{
+				doRemoveBillboard( node );
+			} ) }
 	{
 #if VK_EXT_mesh_shader || VK_NV_mesh_shader
 
@@ -1407,12 +1419,28 @@ namespace castor3d
 
 	void QueueRenderNodes::doAddSubmesh( CulledNodeT< SubmeshRenderNode > const & node )
 	{
-		m_pendingSubmeshes.insert( &node );
+		auto & queue = *getOwner();
+		auto & renderPass = *queue.getOwner();
+
+		if ( renderPass.isValidPass( *node.node->pass )
+			&& renderPass.isValidRenderable( node.node->instance )
+			&& renderPass.isValidNode( *node.node->instance.getParent() ) )
+		{
+			m_pendingSubmeshes.insert( &node );
+		}
 	}
 
 	void QueueRenderNodes::doAddBillboard( CulledNodeT< BillboardRenderNode > const & node )
 	{
-		m_pendingBillboards.insert( &node );
+		auto & queue = *getOwner();
+		auto & renderPass = *queue.getOwner();
+
+		if ( renderPass.isValidPass( *node.node->pass )
+			&& renderPass.isValidRenderable( node.node->instance )
+			&& renderPass.isValidNode( *node.node->instance.getNode() ) )
+		{
+			m_pendingBillboards.insert( &node );
+		}
 	}
 
 	void QueueRenderNodes::doRemoveSubmesh( CulledNodeT< SubmeshRenderNode > const & node )