From 91769d375b21954cc4818ca069fd4b5b809e34f5 Mon Sep 17 00:00:00 2001 From: breki Date: Fri, 20 Nov 2026 14:03:59 +0000 Subject: [PATCH] draw turret firing effects from the scene so they render while the owner is culled or impostored --- trinity/CMakeLists.txt | 1 + trinity/Eve/EveSpaceScene.cpp | 9 ++++++++ trinity/Eve/IEveUnboundedRenderable.h | 20 +++++++++++++++++ .../SpaceObject/Children/EveChildTurret.cpp | 22 +++++++++---------- .../Eve/SpaceObject/Children/EveChildTurret.h | 10 ++++++--- 5 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 trinity/Eve/IEveUnboundedRenderable.h diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 19cad55cb..feedf9494 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -853,6 +853,7 @@ set(_SOURCES Eve/IEveShadowCaster.h Eve/IEveSpaceObject2.h Eve/IEveTransform.h + Eve/IEveUnboundedRenderable.h Font/Tr2FontManager.cpp Font/Tr2FontManager.h Font/Tr2FontManager_Blue.cpp diff --git a/trinity/Eve/EveSpaceScene.cpp b/trinity/Eve/EveSpaceScene.cpp index fb8b1956f..b0d18f94e 100644 --- a/trinity/Eve/EveSpaceScene.cpp +++ b/trinity/Eve/EveSpaceScene.cpp @@ -3,6 +3,7 @@ #include "StdAfx.h" #include "EveSpaceScene.h" #include "IEveShadowCaster.h" +#include "IEveUnboundedRenderable.h" #include "TriDevice.h" #include "Tr2Renderer.h" #include "Tr2PushPopDS.h" @@ -1635,6 +1636,14 @@ void EveSpaceScene::GatherSceneObjectRenderables( std::vector obj->GetRenderables( renderables, m_impostorManager ); } + // Collected here rather than through their owners, so a culled or impostored owner doesn't hide them + auto& frustum = m_updateContext.GetFrustum(); + auto& quadRenderer = *Tr2QuadRenderer::Instance(); + m_componentRegistry->ProcessComponents( [&]( IEveUnboundedRenderable* unbounded ) { + unbounded->GetUnboundedRenderables( renderables ); + unbounded->AddUnboundedQuads( frustum, quadRenderer ); + } ); + if( impostorManager ) { impostorManager->EndUpdate(); diff --git a/trinity/Eve/IEveUnboundedRenderable.h b/trinity/Eve/IEveUnboundedRenderable.h new file mode 100644 index 000000000..bd66210e0 --- /dev/null +++ b/trinity/Eve/IEveUnboundedRenderable.h @@ -0,0 +1,20 @@ +// Copyright © 2026 Fenris Creations ehf. + +#pragma once + +#include "Eve/EveComponentRegistry.h" + +class TriFrustum; +class Tr2QuadRenderer; +struct ITr2Renderable; + +// Renderables that reach outside their owner's bounds (f.ex. a turret firing effect hitting its target). +// The scene collects them directly, so they draw whether the owner is visible, culled or impostored. +// Each one does its own frustum test. +struct IEveUnboundedRenderable +{ + virtual void GetUnboundedRenderables( std::vector& renderables ) = 0; + virtual void AddUnboundedQuads( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const = 0; +}; + +REGISTER_COMPONENT_TYPE( "UnboundedRenderable", IEveUnboundedRenderable ); diff --git a/trinity/Eve/SpaceObject/Children/EveChildTurret.cpp b/trinity/Eve/SpaceObject/Children/EveChildTurret.cpp index 306269b33..1af83edd9 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildTurret.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildTurret.cpp @@ -76,6 +76,8 @@ void EveChildTurret::RegisterComponents() const auto registry = GetComponentRegistry(); if( registry && m_display ) { + registry->RegisterComponent( this ); + if( EveEntityPtr entity = BlueCastPtr( m_firingEffect ) ) { entity->Register( registry ); @@ -269,16 +271,6 @@ void EveChildTurret::UpdateVisibility( const EveUpdateContext& updateContext, co } } -void EveChildTurret::GetRenderables( std::vector& renderables ) -{ - EveChildMesh::GetRenderables( renderables ); - - if( m_display && m_firingEffect ) - { - m_firingEffect->GetRenderables( renderables ); - } -} - void EveChildTurret::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer ) { EveChildMesh::RegisterWithQuadRenderer( quadRenderer ); @@ -289,10 +281,16 @@ void EveChildTurret::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer ) } } -void EveChildTurret::AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const +void EveChildTurret::GetUnboundedRenderables( std::vector& renderables ) { - EveChildMesh::AddQuadsToQuadRenderer( frustum, quadRenderer ); + if( m_display && m_firingEffect ) + { + m_firingEffect->GetRenderables( renderables ); + } +} +void EveChildTurret::AddUnboundedQuads( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const +{ if( m_display && m_firingEffect ) { m_firingEffect->AddQuadsToQuadRenderer( frustum, quadRenderer ); diff --git a/trinity/Eve/SpaceObject/Children/EveChildTurret.h b/trinity/Eve/SpaceObject/Children/EveChildTurret.h index 5d51db4b3..36f271196 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildTurret.h +++ b/trinity/Eve/SpaceObject/Children/EveChildTurret.h @@ -5,6 +5,7 @@ #define EveChildTurret_H #include "EveChildMesh.h" +#include "Eve/IEveUnboundedRenderable.h" #include "Eve/Turret/EveTurretAiming.h" #include "Eve/Turret/EveTurretTarget.h" #include "include/ITr2PoseModifier.h" @@ -14,7 +15,8 @@ BLUE_DECLARE( EveTurretTarget ); BLUE_CLASS( EveChildTurret ) : public EveChildMesh, - public ITr2PoseModifier + public ITr2PoseModifier, + public IEveUnboundedRenderable { public: EXPOSE_TO_BLUE(); @@ -34,9 +36,11 @@ BLUE_CLASS( EveChildTurret ) : void UpdateSyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override; void UpdateAsyncronous( const EveUpdateContext& updateContext, const EveChildUpdateParams& params ) override; void UpdateVisibility( const EveUpdateContext& updateContext, const Matrix& parentTransform, Tr2Lod parentLod ) override; - void GetRenderables( std::vector & renderables ) override; void RegisterWithQuadRenderer( Tr2QuadRenderer & quadRenderer ) override; - void AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const override; + + // IEveUnboundedRenderable: the firing effect reaches the target outside the owner's bounds + void GetUnboundedRenderables( std::vector& renderables ) override; + void AddUnboundedQuads( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const override; void UpdateCachedGeometryData(); void BuildCachedGeometryData( TriGeometryRes & geometryRes );