properly support -keeplights option. Current implementation never worked.

[xonotic/netradiant.git] / tools / quake3 / q3map2 / light.c

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 2d5a81df6550f976205e8f65fa7bf660e2b0bc69..f4a735ca9dab7911ff064621e8d6295e16d7c8fe 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -148,7 +148,6 @@ static void CreateSkyLights( vec3_t color, float value, int iterations, float fi
        int                     angleSteps, elevationSteps;
        float           angle, elevation;
        float           angleStep, elevationStep;
-       float           step, start;
        sun_t           sun;
        
        
@@ -156,10 +155,6 @@ static void CreateSkyLights( vec3_t color, float value, int iterations, float fi
        if( value <= 0.0f || iterations < 2 )
                return;
        
-       /* calculate some stuff */
-       step = 2.0f / (iterations - 1);
-       start = -1.0f;
-       
        /* basic sun setup */
        VectorCopy( color, sun.color );
        sun.deviance = 0.0f;
@@ -405,7 +400,6 @@ void CreateEntityLights( void )
                if(light->extraDist == 0.0f)
                        light->extraDist = extraDist;
                
-               intensity = intensity * pointScale;
                light->photons = intensity;
 
                light->type = EMIT_POINT;
@@ -429,6 +423,7 @@ void CreateEntityLights( void )
                        {
                                Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n",
                                        (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] );
+                               light->photons *= pointScale;
                        }
                        else
                        {
@@ -466,7 +461,7 @@ void CreateEntityLights( void )
                                        /* make a sun */
                                        VectorScale( light->normal, -1.0f, sun.direction );
                                        VectorCopy( light->color, sun.color );
-                                       sun.photons = (intensity / pointScale);
+                                       sun.photons = intensity;
                                        sun.deviance = deviance / 180.0f * Q_PI;
                                        sun.numSamples = numSamples;
                                        sun.style = noStyles ? LS_NORMAL : light->style;
@@ -482,8 +477,14 @@ void CreateEntityLights( void )
                                        /* skip the rest of this love story */
                                        continue;
                                }
+                               else
+                               {
+                                       light->photons *= spotScale;
+                               }
                        }
                }
+               else
+                       light->photons *= pointScale;
                
                /* jitter the light */
                for( j = 1; j < numSamples; j++ )
@@ -2070,6 +2071,18 @@ int LightMain( int argc, char **argv )
        lightmapGamma = game->lightmapGamma;
        Sys_Printf( " lightning gamma: %f\n", lightmapGamma );
 
+       lightmapsRGB = game->lightmapsRGB;
+       if(lightmapsRGB)
+               Sys_Printf( " lightmap colorspace: sRGB\n" );
+       else
+               Sys_Printf( " lightmap colorspace: linear\n" );
+
+       texturesRGB = game->texturesRGB;
+       if(texturesRGB)
+               Sys_Printf( " texture colorspace: sRGB\n" );
+       else
+               Sys_Printf( " texture colorspace: linear\n" );
+
        lightmapCompensate = game->lightmapCompensate;
        Sys_Printf( " lightning compensation: %f\n", lightmapCompensate );
 
@@ -2092,12 +2105,6 @@ int LightMain( int argc, char **argv )
        else
                Sys_Printf( " shader lightstyles hack: enabled\n" );
 
-       keepLights = game->keepLights;
-       if (keepLights == qtrue)
-               Sys_Printf( " keep lights: enabled\n" );
-       else
-               Sys_Printf( " keep lights: disabled\n" );
-
        patchShadows = game->patchShadows;
        if (patchShadows == qtrue)
                Sys_Printf( " patch shadows: enabled\n" );
@@ -2126,7 +2133,25 @@ int LightMain( int argc, char **argv )
                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;
-                       Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, pointScale );
+                       spotScale *= f;
+                       Sys_Printf( "Spherical point (entity) light scaled by %f to %f\n", f, pointScale );
+                       Sys_Printf( "Spot point (entity) light scaled by %f to %f\n", f, spotScale );
+                       i++;
+               }
+               
+               else if( !strcmp( argv[ i ], "-spherical" ) || !strcmp( argv[ i ], "-sphericalscale" ) )
+               {
+                       f = atof( argv[ i + 1 ] );
+                       pointScale *= f;
+                       Sys_Printf( "Spherical point (entity) light scaled by %f to %f\n", f, pointScale );
+                       i++;
+               }
+               
+               else if( !strcmp( argv[ i ], "-spot" ) || !strcmp( argv[ i ], "-spotscale" ) )
+               {
+                       f = atof( argv[ i + 1 ] );
+                       spotScale *= f;
+                       Sys_Printf( "Spot point (entity) light scaled by %f to %f\n", f, spotScale );
                        i++;
                }
                
@@ -2158,6 +2183,7 @@ int LightMain( int argc, char **argv )
                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;
+                       spotScale *= f;
                        areaScale *= f;
                        skyScale *= f;
                        bounceScale *= f;
@@ -2184,20 +2210,20 @@ int LightMain( int argc, char **argv )
                else if( !strcmp( argv[ i ], "-griddirectionality" ) )
                {
                        f = atof( argv[ i + 1 ] );
-                       if(f < 0) f = 0;
-                       if(f > gridAmbientDirectionality) f = gridAmbientDirectionality;
+                       if(f > 1) f = 1;
+                       if(f < gridAmbientDirectionality) gridAmbientDirectionality = f;
                        Sys_Printf( "Grid directionality is %f\n", f );
-                       gridDirectionality *= f;
+                       gridDirectionality = f;
                        i++;
                }
 
                else if( !strcmp( argv[ i ], "-gridambientdirectionality" ) )
                {
                        f = atof( argv[ i + 1 ] );
-                       if(f > gridDirectionality) f = gridDirectionality;
-                       if(f > 1) f = 1;
+                       if(f < -1) f = -1;
+                       if(f > gridDirectionality) gridDirectionality = f;
                        Sys_Printf( "Grid ambient directionality is %f\n", f );
-                       gridAmbientDirectionality *= f;
+                       gridAmbientDirectionality = f;
                        i++;
                }
                
@@ -2209,6 +2235,30 @@ int LightMain( int argc, char **argv )
                        i++;
                }
                
+               else if( !strcmp( argv[ i ], "-sRGBlight" ) )
+               {
+                       lightmapsRGB = qtrue;
+                       Sys_Printf( "Lighting is in sRGB\n" );
+               }
+
+               else if( !strcmp( argv[ i ], "-nosRGBlight" ) )
+               {
+                       lightmapsRGB = qfalse;
+                       Sys_Printf( "Lighting is linear\n" );
+               }
+
+               else if( !strcmp( argv[ i ], "-sRGBtex" ) )
+               {
+                       texturesRGB = qtrue;
+                       Sys_Printf( "Textures are in sRGB\n" );
+               }
+
+               else if( !strcmp( argv[ i ], "-nosRGBtex" ) )
+               {
+                       texturesRGB = qfalse;
+                       Sys_Printf( "Textures are linear\n" );
+               }
+
                else if( !strcmp( argv[ i ], "-exposure" ) )
                {
                        f = atof( argv[ i + 1 ] );
@@ -2258,6 +2308,8 @@ int LightMain( int argc, char **argv )
                {
                        if(*argv[i+1] == '+')
                                lightSamplesInsist = qtrue;
+                       else
+                               lightSamplesInsist = qfalse;
                        lightSamples = atoi( argv[ i + 1 ] );
                        if( lightSamples < 1 )
                                lightSamples = 1;
@@ -2672,11 +2724,6 @@ int LightMain( int argc, char **argv )
                        noStyles = qfalse;
                        Sys_Printf( "Enabling lightstyles\n" );
                }
-               else if( !strcmp( argv[ i ], "-keeplights" ))
-               {
-                       keepLights = qtrue;
-                       Sys_Printf( "Leaving light entities on map after compile\n" );
-               }
                else if( !strcmp( argv[ i ], "-cpma" ) )
                {
                        cpmaHack = qtrue;
@@ -2752,6 +2799,11 @@ int LightMain( int argc, char **argv )
                {
                        lightmapExtraVisClusterNudge = qtrue;
                }
+               else if( !strcmp( argv[ i ], "-fill" ) )
+               {
+                       lightmapFill = qtrue;
+                       Sys_Printf( "Filling lightmap colors from surrounding pixels to improve JPEG compression\n" );
+               }
                /* unhandled args */
                else
                {