swap values 0 and 1 for -exposure (now -exposure 0 does nothing, -exposure 1 did what 0 did before)

This commit is contained in:
Rudolf Polzer 2012-02-09 10:40:48 +01:00 committed by Thomas Debesse
parent 06701fab69
commit 533587bf25
16 changed files with 16 additions and 19 deletions

View file

@ -113,7 +113,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -148,7 +148,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
2.2f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -67,7 +67,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -64,7 +64,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -63,7 +63,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -112,7 +112,7 @@
qfalse, /* wolf lighting model? */
512, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
256, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -112,7 +112,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -76,7 +76,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -84,7 +84,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -139,7 +139,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -112,7 +112,7 @@
qfalse, /* wolf lighting model? */
512, /* lightmap width/height */
2.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -70,7 +70,7 @@
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -129,7 +129,7 @@
qtrue, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -66,7 +66,7 @@
qtrue, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap exposure */
0.0f, /* lightmap exposure */
1.0f, /* lightmap compensate */
512, /* minimap size */
1.0f, /* minimap sharpener */

View file

@ -73,7 +73,7 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale ){
sample[ i ] = pow( sample[ i ] / 255.0f, gamma ) * 255.0f;
}
if ( lightmapExposure == 1 ) {
if ( lightmapExposure == 0 ) {
/* clamp with color normalization */
max = sample[ 0 ];
if ( sample[ 1 ] > max ) {
@ -88,9 +88,6 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale ){
}
else
{
if ( lightmapExposure == 0 ) {
lightmapExposure = 1.0f;
}
inv = 1.f / lightmapExposure;
//Exposure

View file

@ -2232,7 +2232,7 @@ Q_EXTERN float bounceScale Q_ASSIGN( 0.25f );
/* ydnar: lightmap gamma/compensation */
Q_EXTERN float lightmapGamma Q_ASSIGN( 1.0f );
Q_EXTERN float lightmapExposure Q_ASSIGN( 1.0f );
Q_EXTERN float lightmapExposure Q_ASSIGN( 0.0f );
Q_EXTERN float lightmapCompensate Q_ASSIGN( 1.0f );
/* ydnar: for runtime tweaking of falloff tolerance */