swap values 0 and 1 for -exposure (now -exposure 0 does nothing, -exposure 1 did what 0 did before)
This commit is contained in:
parent
42e3d14cd5
commit
c60d22dd26
|
|
@ -116,7 +116,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -151,7 +151,7 @@ game_t struct
|
||||||
qtrue, /* lightmap sRGB */
|
qtrue, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
|
qfalse, /* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -67,7 +67,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -115,7 +115,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ game_t struct
|
||||||
qfalse, /* lightmap sRGB */
|
qfalse, /* lightmap sRGB */
|
||||||
qfalse, /* texture sRGB */
|
qfalse, /* texture sRGB */
|
||||||
qfalse, /* color sRGB */
|
qfalse, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ game_t struct
|
||||||
qtrue, /* lightmap sRGB */
|
qtrue, /* lightmap sRGB */
|
||||||
qtrue, /* texture sRGB */
|
qtrue, /* texture sRGB */
|
||||||
qtrue, /* color sRGB */
|
qtrue, /* color sRGB */
|
||||||
1.0f, /* lightmap exposure */
|
0.0f, /* lightmap exposure */
|
||||||
1.0f, /* lightmap compensate */
|
1.0f, /* lightmap compensate */
|
||||||
1.0f, /* lightgrid scale */
|
1.0f, /* lightgrid scale */
|
||||||
1.0f, /* lightgrid ambient scale */
|
1.0f, /* lightgrid ambient scale */
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale )
|
||||||
sample[ i ] = pow( sample[ i ] / 255.0f, gamma ) * 255.0f;
|
sample[ i ] = pow( sample[ i ] / 255.0f, gamma ) * 255.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lightmapExposure == 1)
|
if (lightmapExposure == 0)
|
||||||
{
|
{
|
||||||
/* clamp with color normalization */
|
/* clamp with color normalization */
|
||||||
max = sample[ 0 ];
|
max = sample[ 0 ];
|
||||||
|
|
@ -87,10 +87,6 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (lightmapExposure==0)
|
|
||||||
{
|
|
||||||
lightmapExposure=1.0f;
|
|
||||||
}
|
|
||||||
inv=1.f/lightmapExposure;
|
inv=1.f/lightmapExposure;
|
||||||
//Exposure
|
//Exposure
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2304,7 +2304,7 @@ Q_EXTERN float lightmapGamma Q_ASSIGN( 1.0f );
|
||||||
Q_EXTERN float lightmapsRGB Q_ASSIGN( qfalse );
|
Q_EXTERN float lightmapsRGB Q_ASSIGN( qfalse );
|
||||||
Q_EXTERN float texturesRGB Q_ASSIGN( qfalse );
|
Q_EXTERN float texturesRGB Q_ASSIGN( qfalse );
|
||||||
Q_EXTERN float colorsRGB Q_ASSIGN( qfalse );
|
Q_EXTERN float colorsRGB Q_ASSIGN( qfalse );
|
||||||
Q_EXTERN float lightmapExposure Q_ASSIGN( 1.0f );
|
Q_EXTERN float lightmapExposure Q_ASSIGN( 0.0f );
|
||||||
Q_EXTERN float lightmapCompensate Q_ASSIGN( 1.0f );
|
Q_EXTERN float lightmapCompensate Q_ASSIGN( 1.0f );
|
||||||
|
|
||||||
/* ydnar: for runtime tweaking of falloff tolerance */
|
/* ydnar: for runtime tweaking of falloff tolerance */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user