Skip to content

Commit fc3a49b

Browse files
committed
renderer/tr_shade: move GetLightMap and GetDeluxeMap next to Render_lightMapping
Render_lightMapping is the only function using GetLightMap and GetDeluxeMap
1 parent a4f097b commit fc3a49b

1 file changed

Lines changed: 47 additions & 47 deletions

File tree

src/engine/renderer/tr_shade.cpp

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -345,53 +345,6 @@ SURFACE SHADERS
345345

346346
ALIGNED( 16, shaderCommands_t tess );
347347

348-
/*
349-
=================
350-
GetLightMap
351-
=================
352-
*/
353-
static image_t* GetLightMap()
354-
{
355-
if ( !tr.lightmaps.currentElements )
356-
{
357-
return tr.whiteImage;
358-
}
359-
else if ( tr.fatLightmap )
360-
{
361-
return tr.fatLightmap;
362-
}
363-
else if ( tess.lightmapNum >= 0 && tess.lightmapNum < tr.lightmaps.currentElements )
364-
{
365-
return ( image_t * ) Com_GrowListElement( &tr.lightmaps, tess.lightmapNum );
366-
}
367-
else
368-
{
369-
return tr.whiteImage;
370-
}
371-
}
372-
373-
/*
374-
=================
375-
GetDeluxeMap
376-
=================
377-
*/
378-
static image_t* GetDeluxeMap()
379-
{
380-
381-
if ( !tr.deluxemaps.currentElements )
382-
{
383-
return tr.blackImage;
384-
}
385-
else if ( tess.lightmapNum >= 0 && tess.lightmapNum < tr.deluxemaps.currentElements )
386-
{
387-
return ( image_t * ) Com_GrowListElement( &tr.deluxemaps, tess.lightmapNum );
388-
}
389-
else
390-
{
391-
return tr.blackImage;
392-
}
393-
}
394-
395348
/*
396349
================
397350
DrawTris
@@ -708,6 +661,53 @@ static void Render_generic( int stage )
708661
GL_CheckErrors();
709662
}
710663

664+
/*
665+
=================
666+
GetLightMap
667+
=================
668+
*/
669+
static image_t* GetLightMap()
670+
{
671+
if ( !tr.lightmaps.currentElements )
672+
{
673+
return tr.whiteImage;
674+
}
675+
else if ( tr.fatLightmap )
676+
{
677+
return tr.fatLightmap;
678+
}
679+
else if ( tess.lightmapNum >= 0 && tess.lightmapNum < tr.lightmaps.currentElements )
680+
{
681+
return ( image_t * ) Com_GrowListElement( &tr.lightmaps, tess.lightmapNum );
682+
}
683+
else
684+
{
685+
return tr.whiteImage;
686+
}
687+
}
688+
689+
/*
690+
=================
691+
GetDeluxeMap
692+
=================
693+
*/
694+
static image_t* GetDeluxeMap()
695+
{
696+
697+
if ( !tr.deluxemaps.currentElements )
698+
{
699+
return tr.blackImage;
700+
}
701+
else if ( tess.lightmapNum >= 0 && tess.lightmapNum < tr.deluxemaps.currentElements )
702+
{
703+
return ( image_t * ) Com_GrowListElement( &tr.deluxemaps, tess.lightmapNum );
704+
}
705+
else
706+
{
707+
return tr.blackImage;
708+
}
709+
}
710+
711711
static void Render_lightMapping( int stage )
712712
{
713713
GLimp_LogComment( "--- Render_lightMapping ---\n" );

0 commit comments

Comments
 (0)