Skip to content
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

Jump to bottom

tr_bsp: set internalLightMapSize in the block using it #821

Merged
merged 1 commit into from Apr 1, 2023
Merged

tr_bsp: set internalLightMapSize in the block using it #821

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/engine/renderer/tr_bsp.cpp
View file
Open in desktop
Expand Up @@ -446,7 +446,6 @@ static std::vector<std::string> R_LoadExternalLightmaps( const char *mapName )
R_LoadLightmaps
===============
*/
static const int LIGHTMAP_SIZE = 128;
static void R_LoadLightmaps( lump_t *l, const char *bspName )
{
if ( r_vertexLighting->integer != 0 )
Expand Down Expand Up @@ -578,8 +577,10 @@ static void R_LoadLightmaps( lump_t *l, const char *bspName )
// we are about to upload textures
R_SyncRenderThread();

const int internalLightMapSize = 128;

// create all the lightmaps
int numLightmaps = len / ( LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3 );
int numLightmaps = len / ( internalLightMapSize * internalLightMapSize * 3 );

if ( numLightmaps == 1 )
{
Expand All @@ -596,21 +597,21 @@ static void R_LoadLightmaps( lump_t *l, const char *bspName )

for ( int i = 0; i < numLightmaps; i++ )
{
byte *lightMapBuffer = (byte*) ri.Hunk_AllocateTempMemory( sizeof( byte ) * LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4 );
byte *lightMapBuffer = (byte*) ri.Hunk_AllocateTempMemory( sizeof( byte ) * internalLightMapSize * internalLightMapSize * 4 );

memset( lightMapBuffer, 128, LIGHTMAP_SIZE * LIGHTMAP_SIZE * 4 );
memset( lightMapBuffer, 128, internalLightMapSize * internalLightMapSize * 4 );

// expand the 24 bit on-disk to 32 bit
byte *buf_p = buf + i * LIGHTMAP_SIZE * LIGHTMAP_SIZE * 3;
byte *buf_p = buf + i * internalLightMapSize * internalLightMapSize * 3;

for ( int y = 0; y < LIGHTMAP_SIZE; y++ )
for ( int y = 0; y < internalLightMapSize; y++ )
{
for ( int x = 0; x < LIGHTMAP_SIZE; x++ )
for ( int x = 0; x < internalLightMapSize; x++ )
{
int index = x + ( y * LIGHTMAP_SIZE );
lightMapBuffer[( index * 4 ) + 0 ] = buf_p[( ( x + ( y * LIGHTMAP_SIZE ) ) * 3 ) + 0 ];
lightMapBuffer[( index * 4 ) + 1 ] = buf_p[( ( x + ( y * LIGHTMAP_SIZE ) ) * 3 ) + 1 ];
lightMapBuffer[( index * 4 ) + 2 ] = buf_p[( ( x + ( y * LIGHTMAP_SIZE ) ) * 3 ) + 2 ];
int index = x + ( y * internalLightMapSize );
lightMapBuffer[( index * 4 ) + 0 ] = buf_p[( ( x + ( y * internalLightMapSize ) ) * 3 ) + 0 ];
lightMapBuffer[( index * 4 ) + 1 ] = buf_p[( ( x + ( y * internalLightMapSize ) ) * 3 ) + 1 ];
lightMapBuffer[( index * 4 ) + 2 ] = buf_p[( ( x + ( y * internalLightMapSize ) ) * 3 ) + 2 ];
lightMapBuffer[( index * 4 ) + 3 ] = 255;

R_ColorShiftLightingBytes( &lightMapBuffer[( index * 4 ) + 0 ], &lightMapBuffer[( index * 4 ) + 0 ] );
Expand All @@ -622,7 +623,7 @@ static void R_LoadLightmaps( lump_t *l, const char *bspName )
imageParams.filterType = filterType_t::FT_DEFAULT;
imageParams.wrapType = wrapTypeEnum_t::WT_CLAMP;

image_t *internalLightMap = R_CreateImage( va( "_internalLightMap%d", i ), (const byte **)&lightMapBuffer, LIGHTMAP_SIZE, LIGHTMAP_SIZE, 1, imageParams );
image_t *internalLightMap = R_CreateImage( va( "_internalLightMap%d", i ), (const byte **)&lightMapBuffer, internalLightMapSize, internalLightMapSize, 1, imageParams );
Com_AddToGrowList( &tr.lightmaps, internalLightMap );

ri.Hunk_FreeTempMemory( lightMapBuffer );
Expand Down