Merge branch 'master' of ssh://icculus.org/netradiant

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

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 2d5a81df6550f976205e8f65fa7bf660e2b0bc69..9323b8c8e3b7a4430244b7b6c12354b92466c6df 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -2184,20 +2184,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++;
                }
                
@@ -2258,6 +2258,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;
@@ -2752,6 +2754,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
                {