fix spotScale implementation

This commit is contained in:
Rudolf Polzer 2011-10-29 16:10:09 +02:00
parent 2cc696a6e1
commit aaa68ca620

View File

@ -423,7 +423,7 @@ void CreateEntityLights( void )
{ {
Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n", Sys_Printf( "WARNING: light at (%i %i %i) has missing target\n",
(int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] ); (int) light->origin[ 0 ], (int) light->origin[ 1 ], (int) light->origin[ 2 ] );
intensity = intensity * pointScale; light->photons *= pointScale;
} }
else else
{ {
@ -479,12 +479,12 @@ void CreateEntityLights( void )
} }
else else
{ {
intensity = intensity * spotScale; light->photons *= spotScale;
} }
} }
} }
else else
intensity = intensity * pointScale; light->photons *= pointScale;
/* jitter the light */ /* jitter the light */
for( j = 1; j < numSamples; j++ ) for( j = 1; j < numSamples; j++ )
@ -2134,23 +2134,24 @@ int LightMain( int argc, char **argv )
f = atof( argv[ i + 1 ] ); f = atof( argv[ i + 1 ] );
pointScale *= f; pointScale *= f;
spotScale *= f; spotScale *= f;
Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, pointScale ); 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++; i++;
} }
if( !strcmp( argv[ i ], "-pointonly" ) || !strcmp( argv[ i ], "-pointonlyscale" ) ) else if( !strcmp( argv[ i ], "-spherical" ) || !strcmp( argv[ i ], "-sphericalscale" ) )
{ {
f = atof( argv[ i + 1 ] ); f = atof( argv[ i + 1 ] );
pointScale *= f; pointScale *= f;
Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, pointScale ); Sys_Printf( "Spherical point (entity) light scaled by %f to %f\n", f, pointScale );
i++; i++;
} }
if( !strcmp( argv[ i ], "-spot" ) || !strcmp( argv[ i ], "-spotscale" ) ) else if( !strcmp( argv[ i ], "-spot" ) || !strcmp( argv[ i ], "-spotscale" ) )
{ {
f = atof( argv[ i + 1 ] ); f = atof( argv[ i + 1 ] );
spotScale *= f; spotScale *= f;
Sys_Printf( "Point (entity) light scaled by %f to %f\n", f, spotScale ); Sys_Printf( "Spot point (entity) light scaled by %f to %f\n", f, spotScale );
i++; i++;
} }