quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

only reserve ONE lightmap at once, not TWO (but make this a #define to allow later customization)

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@367 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
divverent 2009-05-20 17:48:32 +00:00
parent cde1f3c0d5
commit 8b11f84691
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/quake3/q3map2/lightmaps_ydnar.c
View File

@ -1918,9 +1918,10 @@ FindOutLightmaps()
for a given surface lightmap, find output lightmap pages and positions for it for a given surface lightmap, find output lightmap pages and positions for it
*/ */
#define LIGHTMAP_RESERVE_COUNT 1
static void FindOutLightmaps( rawLightmap_t *lm ) static void FindOutLightmaps( rawLightmap_t *lm )
{ {
int i, j, lightmapNum, xMax, yMax, x, y, sx, sy, ox, oy, offset, temp; int i, j, k, lightmapNum, xMax, yMax, x, y, sx, sy, ox, oy, offset, temp;
outLightmap_t *olm; outLightmap_t *olm;
surfaceInfo_t *info; surfaceInfo_t *info;
float *luxel, *deluxel; float *luxel, *deluxel;
@ -2015,7 +2016,7 @@ static void FindOutLightmaps( rawLightmap_t *lm )
y = 0; y = 0;
/* walk the list of lightmap pages */ /* walk the list of lightmap pages */
for( i = noLightmapSearch ? numOutLightmaps - 2 : 0; i < numOutLightmaps; i++ ) for( i = noLightmapSearch ? numOutLightmaps - LIGHTMAP_RESERVE_COUNT : 0; i < numOutLightmaps; i++ )
{ {
/* get the output lightmap */ /* get the output lightmap */
olm = &outLightmaps[ i ]; olm = &outLightmaps[ i ];
@ -2069,10 +2070,10 @@ static void FindOutLightmaps( rawLightmap_t *lm )
/* no match? */ /* no match? */
if( ok == qfalse ) if( ok == qfalse )
{ {
/* allocate two new output lightmaps */ /* allocate LIGHTMAP_RESERVE_COUNT new output lightmaps */
numOutLightmaps += 2; numOutLightmaps += LIGHTMAP_RESERVE_COUNT;
olm = safe_malloc( numOutLightmaps * sizeof( outLightmap_t ) ); olm = safe_malloc( numOutLightmaps * sizeof( outLightmap_t ) );
if( outLightmaps != NULL && numOutLightmaps > 2 ) if( outLightmaps != NULL && numOutLightmaps > LIGHTMAP_RESERVE_COUNT )
{ {
memcpy( olm, outLightmaps, (numOutLightmaps - 2) * sizeof( outLightmap_t ) ); memcpy( olm, outLightmaps, (numOutLightmaps - 2) * sizeof( outLightmap_t ) );
free( outLightmaps ); free( outLightmaps );
@ -2080,11 +2081,11 @@ static void FindOutLightmaps( rawLightmap_t *lm )
outLightmaps = olm; outLightmaps = olm;
/* initialize both out lightmaps */ /* initialize both out lightmaps */
SetupOutLightmap( lm, &outLightmaps[ numOutLightmaps - 2 ] ); for(k = numOutLightmaps - LIGHTMAP_RESERVE_COUNT; k < numOutLightmaps; ++k)
SetupOutLightmap( lm, &outLightmaps[ numOutLightmaps - 1 ] ); SetupOutLightmap( lm, &outLightmaps[ k ] );
/* set out lightmap */ /* set out lightmap */
i = numOutLightmaps - 2; i = numOutLightmaps - LIGHTMAP_RESERVE_COUNT;
olm = &outLightmaps[ i ]; olm = &outLightmaps[ i ];
/* set stamp xy origin to the first surface lightmap */ /* set stamp xy origin to the first surface lightmap */