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

* -brightness only affects lightmap brightness, like q3map_lightmapBrightness, as there are -vertexscale and -gridscale for the rest

Browse Source 
is multipled with q3map_lightmapBrightness
This commit is contained in:
Garux 2019-12-12 00:20:00 +03:00
parent 3f2825b8ec
commit c401adfe3e
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2422,11 +2422,10 @@ int LightMain( int argc, char **argv ){
i++; i++;
} }
/* Lighting brightness */ /* Lightmaps brightness */
else if( !strcmp( argv[ i ], "-brightness" ) ){ else if( !strcmp( argv[ i ], "-brightness" ) ){
f = atof( argv[ i + 1 ] ); lightmapBrightness = atof( argv[ i + 1 ] );
lightmapBrightness = f; Sys_Printf( "Scaling lightmaps brightness by %f\n", lightmapBrightness );
Sys_Printf( "Lighting brightness set to %f\n", lightmapBrightness );
i++; i++;
} }

2
tools/quake3/q3map2/light_ydnar.c
View File

@ -55,8 +55,6 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale ){
if ( scale <= 0.0f ) { if ( scale <= 0.0f ) {
scale = 1.0f; scale = 1.0f;
} }
/* globally */
scale *= lightmapBrightness;
/* make a local copy */ /* make a local copy */
VectorScale( color, scale, sample ); VectorScale( color, scale, sample );

3
tools/quake3/q3map2/shaders.c
View File

@ -660,6 +660,7 @@ static shaderInfo_t *AllocShaderInfo( void ){
si->patchShadows = qfalse; si->patchShadows = qfalse;
si->vertexShadows = qtrue; /* ydnar: changed default behavior */ si->vertexShadows = qtrue; /* ydnar: changed default behavior */
si->forceSunlight = qfalse; si->forceSunlight = qfalse;
si->lmBrightness = lightmapBrightness;
si->vertexScale = vertexglobalscale; si->vertexScale = vertexglobalscale;
si->notjunc = qfalse; si->notjunc = qfalse;
@ -1599,7 +1600,7 @@ static void ParseShaderFile( const char *filename ){
/* ydnar: q3map_lightmapBrightness N (for autogenerated shaders + external tga lightmaps) */ /* ydnar: q3map_lightmapBrightness N (for autogenerated shaders + external tga lightmaps) */
else if ( !Q_stricmp( token, "q3map_lightmapBrightness" ) || !Q_stricmp( token, "q3map_lightmapGamma" ) ) { else if ( !Q_stricmp( token, "q3map_lightmapBrightness" ) || !Q_stricmp( token, "q3map_lightmapGamma" ) ) {
GetTokenAppend( shaderText, qfalse ); GetTokenAppend( shaderText, qfalse );
si->lmBrightness = atof( token ); si->lmBrightness *= atof( token );
if ( si->lmBrightness < 0 ) { if ( si->lmBrightness < 0 ) {
si->lmBrightness = 1.0; si->lmBrightness = 1.0;
} }