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

-minsamplesize

Browse Source 
git-svn-id: svn://svn.icculus.org/netradiant/trunk@99 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
rpolzer 2008-09-22 11:07:44 +00:00
parent 576b0dd959
commit a27eb6c180
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/quake3/q3map2/bsp.c
View File

@ -732,6 +732,14 @@ int BSPMain( int argc, char **argv )
i++; i++;
Sys_Printf( "Lightmap sample size set to %dx%d units\n", sampleSize, sampleSize ); Sys_Printf( "Lightmap sample size set to %dx%d units\n", sampleSize, sampleSize );
} }
else if( !strcmp( argv[ i ], "-minsamplesize" ) )
{
minSampleSize = atoi( argv[ i + 1 ] );
if( minSampleSize < 1 )
minSampleSize = 1;
i++;
Sys_Printf( "Minimum lightmap sample size set to %dx%d units\n", minSampleSize, minSampleSize );
}
else if( !strcmp( argv[ i ], "-custinfoparms") ) else if( !strcmp( argv[ i ], "-custinfoparms") )
{ {
Sys_Printf( "Custom info parms enabled\n" ); Sys_Printf( "Custom info parms enabled\n" );

8
tools/quake3/q3map2/light.c
View File

@ -2216,6 +2216,14 @@ int LightMain( int argc, char **argv )
i++; i++;
Sys_Printf( "Default lightmap sample size set to %dx%d units\n", sampleSize, sampleSize ); Sys_Printf( "Default lightmap sample size set to %dx%d units\n", sampleSize, sampleSize );
} }
else if( !strcmp( argv[ i ], "-minsamplesize" ) )
{
minSampleSize = atoi( argv[ i + 1 ] );
if( minSampleSize < 1 )
minSampleSize = 1;
i++;
Sys_Printf( "Minimum lightmap sample size set to %dx%d units\n", minSampleSize, minSampleSize );
}
else if( !strcmp( argv[ i ], "-novertex" ) ) else if( !strcmp( argv[ i ], "-novertex" ) )
{ {
noVertexLighting = qtrue; noVertexLighting = qtrue;

4
tools/quake3/q3map2/q3map2.h
View File

@ -248,6 +248,7 @@ constants
#define GRID_EPSILON 0.0f #define GRID_EPSILON 0.0f
#define DEFAULT_LIGHTMAP_SAMPLE_SIZE 16 #define DEFAULT_LIGHTMAP_SAMPLE_SIZE 16
#define DEFAULT_LIGHTMAP_MIN_SAMPLE_SIZE 0
#define DEFAULT_LIGHTMAP_SAMPLE_OFFSET 1.0f #define DEFAULT_LIGHTMAP_SAMPLE_OFFSET 1.0f
#define DEFAULT_SUBDIVIDE_THRESHOLD 1.0f #define DEFAULT_SUBDIVIDE_THRESHOLD 1.0f
@ -1656,6 +1657,7 @@ int GetSurfaceExtraEntityNum( int num );
int GetSurfaceExtraCastShadows( int num ); int GetSurfaceExtraCastShadows( int num );
int GetSurfaceExtraRecvShadows( int num ); int GetSurfaceExtraRecvShadows( int num );
int GetSurfaceExtraSampleSize( int num ); int GetSurfaceExtraSampleSize( int num );
int GetSurfaceExtraMinSampleSize( int num );
float GetSurfaceExtraLongestCurve( int num ); float GetSurfaceExtraLongestCurve( int num );
void GetSurfaceExtraLightmapAxis( int num, vec3_t lightmapAxis ); void GetSurfaceExtraLightmapAxis( int num, vec3_t lightmapAxis );
@ -1953,6 +1955,7 @@ Q_EXTERN char source[ 1024 ];
Q_EXTERN char outbase[ 32 ]; Q_EXTERN char outbase[ 32 ];
Q_EXTERN int sampleSize; /* lightmap sample size in units */ Q_EXTERN int sampleSize; /* lightmap sample size in units */
Q_EXTERN int minSampleSize; /* minimum sample size to use at all */
Q_EXTERN int mapEntityNum Q_ASSIGN( 0 ); Q_EXTERN int mapEntityNum Q_ASSIGN( 0 );
@ -2079,6 +2082,7 @@ Q_EXTERN qboolean loMem Q_ASSIGN( qfalse );
Q_EXTERN qboolean noStyles Q_ASSIGN( qfalse ); Q_EXTERN qboolean noStyles Q_ASSIGN( qfalse );
Q_EXTERN int sampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_SAMPLE_SIZE ); Q_EXTERN int sampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_SAMPLE_SIZE );
Q_EXTERN int minSampleSize Q_ASSIGN( DEFAULT_LIGHTMAP_MIN_SAMPLE_SIZE );
Q_EXTERN qboolean noVertexLighting Q_ASSIGN( qfalse ); Q_EXTERN qboolean noVertexLighting Q_ASSIGN( qfalse );
Q_EXTERN qboolean noGridLighting Q_ASSIGN( qfalse ); Q_EXTERN qboolean noGridLighting Q_ASSIGN( qfalse );

4
tools/quake3/q3map2/surface.c
View File

@ -640,7 +640,9 @@ void ClassifySurfaces( int numSurfs, mapDrawSurface_t *ds )
ds->sampleSize *= ds->lightmapScale; ds->sampleSize *= ds->lightmapScale;
if( ds->sampleSize <= 0 ) if( ds->sampleSize <= 0 )
ds->sampleSize = 1; ds->sampleSize = 1;
else if( ds->sampleSize > 16384 ) /* powers of 2 are preferred */ if(ds->sampleSize < minSampleSize)
ds->sampleSize = minSampleSize;
if( ds->sampleSize > 16384 ) /* powers of 2 are preferred */
ds->sampleSize = 16384; ds->sampleSize = 16384;
} }
} }