Merge branch 'subdiv' into 'master'

[q3map2] allow to set arbitrary default light subdivision value

See merge request !67

diff --git a/tools/quake3/q3map2/help.c b/tools/quake3/q3map2/help.c
index 5cc81ab9f6abfe768f11499ba34ff51456f82694..9e8a590ca49a8597bc155232b6aad32d9173b7d8 100644 (file)
--- a/tools/quake3/q3map2/help.c
+++ b/tools/quake3/q3map2/help.c
@@ -207,6 +207,7 @@ void HelpLight()
                {"-keeplights", "Keep light entities in the BSP file after compile"},
                {"-lightmapdir <directory>", "Directory to store external lightmaps (default: same as map name without extension)"},
                {"-lightmapsize <N>", "Size of lightmaps to generate (must be a power of two)"},
+               {"-lightsubdiv <N>", "Size of light emitting shader subdivision"},
                {"-lomem", "Low memory but slower lighting mode"},
                {"-lowquality", "Low quality floodlight (appears to currently break floodlight)"},
                {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index 0bbb5e7be21ac65aee3033978db5f22af081c599..756b7731b2ef028acbb15b8ad5e2151689299028 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -2120,7 +2120,6 @@ int LightMain( int argc, char **argv ){
        qboolean lightSamplesInsist = qfalse;
        qboolean fastAllocate = qfalse;
 
-
        /* note it */
        Sys_Printf( "--- Light ---\n" );
        Sys_Printf( "--- ProcessGameSpecific ---\n" );
@@ -2778,6 +2777,14 @@ int LightMain( int argc, char **argv ){
                        loMem = qtrue;
                        Sys_Printf( "Enabling low-memory (potentially slower) lighting mode\n" );
                }
+               else if ( !strcmp( argv[ i ], "-lightsubdiv" ) ) {
+                       defaultLightSubdivide = atoi( argv[ i + 1 ] );
+                       if ( defaultLightSubdivide < 1 ) {
+                               defaultLightSubdivide = 1;
+                       }
+                       i++;
+                       Sys_Printf( "Default light subdivision set to %d\n", defaultLightSubdivide );
+               }
                else if ( !strcmp( argv[ i ], "-lightanglehl" ) ) {
                        if ( ( atoi( argv[ i + 1 ] ) != 0 ) != lightAngleHL ) {
                                lightAngleHL = ( atoi( argv[ i + 1 ] ) != 0 );