Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions trinity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions trinity/Eve/EveSpaceScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1635,6 +1636,14 @@ void EveSpaceScene::GatherSceneObjectRenderables( std::vector<IEveSpaceObject2*>
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>( [&]( IEveUnboundedRenderable* unbounded ) {
unbounded->GetUnboundedRenderables( renderables );
unbounded->AddUnboundedQuads( frustum, quadRenderer );
} );

if( impostorManager )
{
impostorManager->EndUpdate();
Expand Down
20 changes: 20 additions & 0 deletions trinity/Eve/IEveUnboundedRenderable.h
Original file line number Diff line number Diff line change
@@ -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<ITr2Renderable*>& renderables ) = 0;
virtual void AddUnboundedQuads( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const = 0;
};

REGISTER_COMPONENT_TYPE( "UnboundedRenderable", IEveUnboundedRenderable );
22 changes: 10 additions & 12 deletions trinity/Eve/SpaceObject/Children/EveChildTurret.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ void EveChildTurret::RegisterComponents()
const auto registry = GetComponentRegistry();
if( registry && m_display )
{
registry->RegisterComponent<IEveUnboundedRenderable>( this );

if( EveEntityPtr entity = BlueCastPtr( m_firingEffect ) )
{
entity->Register( registry );
Expand Down Expand Up @@ -269,16 +271,6 @@ void EveChildTurret::UpdateVisibility( const EveUpdateContext& updateContext, co
}
}

void EveChildTurret::GetRenderables( std::vector<ITr2Renderable*>& renderables )
{
EveChildMesh::GetRenderables( renderables );

if( m_display && m_firingEffect )
{
m_firingEffect->GetRenderables( renderables );
}
}

void EveChildTurret::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer )
{
EveChildMesh::RegisterWithQuadRenderer( quadRenderer );
Expand All @@ -289,10 +281,16 @@ void EveChildTurret::RegisterWithQuadRenderer( Tr2QuadRenderer& quadRenderer )
}
}

void EveChildTurret::AddQuadsToQuadRenderer( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const
void EveChildTurret::GetUnboundedRenderables( std::vector<ITr2Renderable*>& 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 );
Expand Down
10 changes: 7 additions & 3 deletions trinity/Eve/SpaceObject/Children/EveChildTurret.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Copyright © 2026 Fenris Creations ehf.

#pragma once
Expand All @@ -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"
Expand All @@ -14,7 +15,8 @@

BLUE_CLASS( EveChildTurret ) :
public EveChildMesh,
public ITr2PoseModifier
public ITr2PoseModifier,
public IEveUnboundedRenderable
{
public:
EXPOSE_TO_BLUE();
Expand All @@ -34,9 +36,11 @@
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<ITr2Renderable*> & renderables ) override;
void RegisterWithQuadRenderer( Tr2QuadRenderer & quadRenderer ) override;

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-format suggestion

Suggested change
void RegisterWithQuadRenderer( Tr2QuadRenderer & quadRenderer ) 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<ITr2Renderable*>& renderables ) override;
void AddUnboundedQuads( const TriFrustum& frustum, Tr2QuadRenderer& quadRenderer ) const override;

void UpdateCachedGeometryData();
void BuildCachedGeometryData( TriGeometryRes & geometryRes );

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clang-format suggestion

Suggested change
void BuildCachedGeometryData( TriGeometryRes & geometryRes );
void BuildCachedGeometryData( TriGeometryRes& geometryRes );

Expand Down
Loading