Skip to content

PLAT-12035: stop Tr2InteriorScene re-creating shadow maps on every li… #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JohnGreenFC wants to merge 2 commits into
base: main
Choose a base branch
from
+44 −19
Open

PLAT-12035: stop Tr2InteriorScene re-creating shadow maps on every li… #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1c696
PLAT-12035: stop Tr2InteriorScene re-creating shadow maps on every li…
JohnGreenFC Oct 19, 2026
e025cd1
Merge branch 'main' into PLAT-12035-interior-scene-shadow-map-recreation
JohnGreenFC Oct 19, 2026
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
62 changes: 43 additions & 19 deletions trinity/Interior/Tr2InteriorScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Tr2InteriorScene::Tr2InteriorScene( IRoot* lockobj /*= NULL */ ) :
m_optimizeShadows( true ),
m_renderShadows( true ),
m_debugRenderShadowMaps( false ),
m_shadowMapsDirty( true ),
m_shadowMap0Var( "SpotlightShadow0", (TriTextureRes*)NULL ),
m_shadowMap1Var( "SpotlightShadow1", (TriTextureRes*)NULL ),
m_shadowMap2Var( "SpotlightShadow2", (TriTextureRes*)NULL ),
Expand Down Expand Up @@ -212,14 +213,9 @@ bool Tr2InteriorScene::OnModified( Be::Var* value )
SetBackgroundCubemapResPath();
}

if( IsMatch( value, m_shadowSize ) )
if( IsMatch( value, m_shadowSize ) || IsMatch( value, m_shadowCount ) )
{
SetupShadowMaps();
}

if( IsMatch( value, m_shadowCount ) )
{
SetupShadowMaps();
m_shadowMapsDirty = true;
}

return true;
Expand All @@ -230,7 +226,7 @@ void Tr2InteriorScene::OnListModified( long event, ssize_t key, ssize_t key2, IR
{
if( theList == &m_lights )
{
SetupShadowMaps();
m_shadowMapsDirty = true;
}

else if( theList == &m_dynamics )
Expand Down Expand Up @@ -659,21 +655,49 @@ void Tr2InteriorScene::RenderFullForward( Tr2RenderContext& renderContext )

void Tr2InteriorScene::SetupShadowMaps()
{
m_lightRenderTargets.Clear();
m_shadowMapsDirty = false;

for( int i = 0; i < (int)( m_lights.size() ) && i < m_shadowCount; i++ )
const unsigned size = m_shadowSize > 0 ? (unsigned)m_shadowSize : 1;
int count = (int)m_lights.size();
if( count > m_shadowCount )
{
count = m_shadowCount;
}
if( count < 0 )
{
count = 0;
}

if( m_lightDepthStencil && ( !m_lightDepthStencil->IsValid() || m_lightDepthStencil->GetWidth() != size ) )
{
m_lightDepthStencil = Tr2DepthStencilPtr();
}
if( !m_lightDepthStencil )
{
m_lightDepthStencil.CreateInstance();
m_lightDepthStencil->Create( size, size, Tr2RenderContextEnum::DSFMT_D32, 0, 0 );
}

if( !m_lightRenderTargets.empty() )
{
Tr2RenderTarget* first = m_lightRenderTargets[0];
if( !first || !first->IsValid() || first->GetWidth() != size )
{
m_lightRenderTargets.Clear();
}
}
while( (int)m_lightRenderTargets.size() > count )
{
m_lightRenderTargets.Remove( -1 );
}
while( (int)m_lightRenderTargets.size() < count )
{
Tr2RenderTargetPtr rt;
rt.CreateInstance();
rt->SetName( "ShadowMap" );
rt->Create( m_shadowSize, m_shadowSize, 1, Tr2RenderContextEnum::PIXEL_FORMAT_R32_FLOAT, 1, 0 );
rt->Create( size, size, 1, Tr2RenderContextEnum::PIXEL_FORMAT_R32_FLOAT, 1, 0 );
m_lightRenderTargets.Append( rt );
}

// Setup depth stencil texture
m_lightDepthStencil = Tr2DepthStencilPtr();
m_lightDepthStencil.CreateInstance();
m_lightDepthStencil->Create( m_shadowSize, m_shadowSize, Tr2RenderContextEnum::DSFMT_D32, 0, 0 );
}

// --------------------------------------------------------------------------------------
Expand All @@ -689,7 +713,7 @@ void Tr2InteriorScene::RenderShadows( Tr2RenderContext& renderContext )
return;
}

if( !m_lightDepthStencil )
if( m_shadowMapsDirty || !m_lightDepthStencil )
{
SetupShadowMaps();
}
Expand Down Expand Up @@ -926,7 +950,7 @@ void Tr2InteriorScene::AddLightSource( ITr2InteriorLight* lightSource )
m_lights.Insert( -1, lightSource );
}

SetupShadowMaps();
m_shadowMapsDirty = true;
}

// --------------------------------------------------------------------------------------
Expand Down Expand Up @@ -956,7 +980,7 @@ void Tr2InteriorScene::RemoveLightSource( ITr2InteriorLight* lightSource )

m_lights.Remove( pos );

SetupShadowMaps();
m_shadowMapsDirty = true;
}

// --------------------------------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions trinity/Interior/Tr2InteriorScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ class Tr2InteriorScene : public IInitialize,
private:
// A shared depth stencil texture for light shadow maps
Tr2DepthStencilPtr m_lightDepthStencil;
bool m_shadowMapsDirty;

// Holds the main render batch list for opaques, decals, and transparent batches
ITriRenderBatchAccumulator* m_primaryRenderBatches;
Expand Down
Loading