add separate spotlight scale -spotscale

diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index b6dcb1224e1c14589c00f554da66e84353d1f840..512146e771d1138f0482d0597490fb7738796b9d 100644 (file)
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -400,7 +400,6 @@ void CreateEntityLights( void )
                if(light->extraDist == 0.0f)
                        light->extraDist = extraDist;
                
                if(light->extraDist == 0.0f)
                        light->extraDist = extraDist;
                

-               intensity = intensity * pointScale;

                light->photons = intensity;
 
                light->type = EMIT_POINT;
                light->photons = intensity;
 
                light->type = EMIT_POINT;


@@ -424,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 ] );
                        {
                                Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n",
                                        (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] );

+                               intensity = intensity * pointScale;

                        }
                        else
                        {
                        }
                        else
                        {


@@ -461,7 +461,7 @@ void CreateEntityLights( void )
                                        /* make a sun */
                                        VectorScale( light->normal, -1.0f, sun.direction );
                                        VectorCopy( light->color, sun.color );
                                        /* 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;
                                        sun.deviance = deviance / 180.0f * Q_PI;
                                        sun.numSamples = numSamples;
                                        sun.style = noStyles ? LS_NORMAL : light->style;


@@ -477,8 +477,14 @@ void CreateEntityLights( void )
                                        /* skip the rest of this love story */
                                        continue;
                                }
                                        /* skip the rest of this love story */
                                        continue;
                                }

+                               else
+                               {
+                                       intensity = intensity * spotScale;
+                               }

                        }
                }
                        }
                }

+               else
+                       intensity = intensity * pointScale;

                
                /* jitter the light */
                for( j = 1; j < numSamples; j++ )
                
                /* jitter the light */
                for( j = 1; j < numSamples; j++ )


@@ -2124,6 +2130,15 @@ int LightMain( int argc, char **argv )
        {
                /* lightsource scaling */
                if( !strcmp( argv[ i ], "-point" ) || !strcmp( argv[ i ], "-pointscale" ) )
        {
                /* lightsource scaling */
                if( !strcmp( argv[ i ], "-point" ) || !strcmp( argv[ i ], "-pointscale" ) )

+               {
+                       f = atof( argv[ i + 1 ] );
+                       pointScale *= f;
+                       spotScale *= f;
+                       Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, pointScale );
+                       i++;
+               }
+               
+               if( !strcmp( argv[ i ], "-pointonly" ) || !strcmp( argv[ i ], "-pointonlyscale" ) )

                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;
                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;


@@ -2131,6 +2146,14 @@ int LightMain( int argc, char **argv )
                        i++;
                }
                
                        i++;
                }
                

+               if( !strcmp( argv[ i ], "-spot" ) || !strcmp( argv[ i ], "-spotscale" ) )
+               {
+                       f = atof( argv[ i + 1 ] );
+                       spotScale *= f;
+                       Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, spotScale );
+                       i++;
+               }
+               

                else if( !strcmp( argv[ i ], "-area" ) || !strcmp( argv[ i ], "-areascale" ) )
                {
                        f = atof( argv[ i + 1 ] );
                else if( !strcmp( argv[ i ], "-area" ) || !strcmp( argv[ i ], "-areascale" ) )
                {
                        f = atof( argv[ i + 1 ] );


@@ -2159,6 +2182,7 @@ int LightMain( int argc, char **argv )
                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;
                {
                        f = atof( argv[ i + 1 ] );
                        pointScale *= f;

+                       spotScale *= f;

                        areaScale *= f;
                        skyScale *= f;
                        bounceScale *= f;
                        areaScale *= f;
                        skyScale *= f;
                        bounceScale *= f;

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 3d3509a4dd7096426ddb2047b529fd2112024874..9172415ed7567bf3217510a9877fd10a1a7802fb 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -2280,6 +2280,7 @@ Q_EXTERN float                            maxMapDistance Q_ASSIGN( 0 );
 
 /* for run time tweaking of light sources */
 Q_EXTERN float                         pointScale Q_ASSIGN( 7500.0f );
 
 /* for run time tweaking of light sources */
 Q_EXTERN float                         pointScale Q_ASSIGN( 7500.0f );

+Q_EXTERN float                         spotScale Q_ASSIGN( 7500.0f );

 Q_EXTERN float                         areaScale Q_ASSIGN( 0.25f );
 Q_EXTERN float                         skyScale Q_ASSIGN( 1.0f );
 Q_EXTERN float                         bounceScale Q_ASSIGN( 0.25f );
 Q_EXTERN float                         areaScale Q_ASSIGN( 0.25f );
 Q_EXTERN float                         skyScale Q_ASSIGN( 1.0f );
 Q_EXTERN float                         bounceScale Q_ASSIGN( 0.25f );