swap values 0 and 1 for -exposure (now -exposure 0 does nothing, -exposure 1 did...

diff --git a/tools/quake3/q3map2/game_ef.h b/tools/quake3/q3map2/game_ef.h
index 7800f2bb99659b834d346dd98e8ef94bbee35f81..374e932db0251a4abe748964be55dd88145e792f 100644 (file)
--- a/tools/quake3/q3map2/game_ef.h
+++ b/tools/quake3/q3map2/game_ef.h
@@ -116,7 +116,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_etut.h b/tools/quake3/q3map2/game_etut.h
index ebc0b92ca74a0566e4e949f5f24616ec9f5c7e30..4b12631f5d583f9ba67cd356fd966ecd950c1163 100644 (file)
--- a/tools/quake3/q3map2/game_etut.h
+++ b/tools/quake3/q3map2/game_etut.h
@@ -151,7 +151,7 @@ game_t struct
        qtrue,                          /* lightmap sRGB */
        qfalse,                         /* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_ja.h b/tools/quake3/q3map2/game_ja.h
index daf1f803430e7428b88f7a220049bad859659ca6..71f078d2c3a9853c116ffce763b711246ae54ba3 100644 (file)
--- a/tools/quake3/q3map2/game_ja.h
+++ b/tools/quake3/q3map2/game_ja.h
@@ -70,7 +70,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_jk2.h b/tools/quake3/q3map2/game_jk2.h
index b56e6e1110dfec9f630b70544708ad56bcaa7fe6..1f763b393351fc6705b12a3240490dc0f5f1b3ea 100644 (file)
--- a/tools/quake3/q3map2/game_jk2.h
+++ b/tools/quake3/q3map2/game_jk2.h
@@ -67,7 +67,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_nexuiz.h b/tools/quake3/q3map2/game_nexuiz.h
index dcfc0a22f69bb12d1965cd28a609cb79bc29096b..71f9bec55f600c36628d493e99b2f60e21509521 100644 (file)
--- a/tools/quake3/q3map2/game_nexuiz.h
+++ b/tools/quake3/q3map2/game_nexuiz.h
@@ -66,7 +66,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_qfusion.h b/tools/quake3/q3map2/game_qfusion.h
index 1a2c926f196f0b946f9ee12fdd03ef0dbe21f143..8607ecf3091b71ca56a9596b7effaef4c448f32f 100644 (file)
--- a/tools/quake3/q3map2/game_qfusion.h
+++ b/tools/quake3/q3map2/game_qfusion.h
@@ -118,7 +118,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_quake3.h b/tools/quake3/q3map2/game_quake3.h
index 90a066e55f0f28e713256234943c9fe9b1d39014..62d4de6146bb31112d9cd397325aeaf197a83952 100644 (file)
--- a/tools/quake3/q3map2/game_quake3.h
+++ b/tools/quake3/q3map2/game_quake3.h
@@ -115,7 +115,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_quakelive.h b/tools/quake3/q3map2/game_quakelive.h
index e6703fc97e8395ac2d0e02d4fc0b79160c2d9126..54661b426fe3ad395aed5864c5870d02070eda1e 100644 (file)
--- a/tools/quake3/q3map2/game_quakelive.h
+++ b/tools/quake3/q3map2/game_quakelive.h
@@ -67,7 +67,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_reaction.h b/tools/quake3/q3map2/game_reaction.h
index 55b19c3f3afc6e318bf5635981dc75d72efa92db..6a31d8a960016e80b25893f14a209551c47624b8 100644 (file)
--- a/tools/quake3/q3map2/game_reaction.h
+++ b/tools/quake3/q3map2/game_reaction.h
@@ -87,7 +87,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_sof2.h b/tools/quake3/q3map2/game_sof2.h
index adce6b67f8c829be6184693e2e92f26d5388ca0a..95e99e7bd2aeead5202e6a2477a8296a945c08cf 100644 (file)
--- a/tools/quake3/q3map2/game_sof2.h
+++ b/tools/quake3/q3map2/game_sof2.h
@@ -142,7 +142,7 @@ game_t struct
        qfalse,                                 /* lightmap sRGB */
        qfalse,                                 /* texture sRGB */
        qfalse,                                 /* color sRGB */
-       1.0f,                                   /* lightmap exposure */
+       0.0f,                                   /* lightmap exposure */
        1.0f,                                   /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_tenebrae.h b/tools/quake3/q3map2/game_tenebrae.h
index 081c9c4d25fbdfc86155d35c30283b1bccf4ed7a..57fff05bab5b71697164cad8d1d3405c36ebd5d2 100644 (file)
--- a/tools/quake3/q3map2/game_tenebrae.h
+++ b/tools/quake3/q3map2/game_tenebrae.h
@@ -115,7 +115,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_tremulous.h b/tools/quake3/q3map2/game_tremulous.h
index a74c539c54e869a487651b7358ad457563eb3892..e9a3356698e8d349c28097a4a2ebe5225ff995b1 100644 (file)
--- a/tools/quake3/q3map2/game_tremulous.h
+++ b/tools/quake3/q3map2/game_tremulous.h
@@ -73,7 +73,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_wolf.h b/tools/quake3/q3map2/game_wolf.h
index d16e2db5123f2d9af8e5a80f5b40a2fa9a7e84e2..d802b7ce2b063076bc14931da4997d86dfd91ab9 100644 (file)
--- a/tools/quake3/q3map2/game_wolf.h
+++ b/tools/quake3/q3map2/game_wolf.h
@@ -132,7 +132,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_wolfet.h b/tools/quake3/q3map2/game_wolfet.h
index f6c69d1d161efb99a1a1217131d02298060f2c86..b094d71f0d1ace08d27890250344b8d469b39b01 100644 (file)
--- a/tools/quake3/q3map2/game_wolfet.h
+++ b/tools/quake3/q3map2/game_wolfet.h
@@ -69,7 +69,7 @@ game_t struct
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
        qfalse,                         /* color sRGB */
-       1.0f,                           /* lightmap exposure */
+       0.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
        1.0f,                           /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/game_xonotic.h b/tools/quake3/q3map2/game_xonotic.h
index cf75485421aba5dddaebb8c91eca3ee6f9d9e999..8b66b90c02ab78a98697f432f3cd2f53e46792a7 100644 (file)
--- a/tools/quake3/q3map2/game_xonotic.h
+++ b/tools/quake3/q3map2/game_xonotic.h
@@ -66,7 +66,7 @@ game_t struct
        qtrue, /* lightmap sRGB */
        qtrue, /* texture sRGB */
        qtrue, /* color sRGB */
-       1.0f, /* lightmap exposure */
+       0.0f, /* lightmap exposure */
        1.0f, /* lightmap compensate */
        1.0f, /* lightgrid scale */
        1.0f, /* lightgrid ambient scale */

diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c
index 3bf04ba76dcf457ad157bfb9ef16e2878e4ee1f0..e08b12f585577bc2619979e7816832e293c6be2c 100644 (file)
--- a/tools/quake3/q3map2/light_ydnar.c
+++ b/tools/quake3/q3map2/light_ydnar.c
@@ -74,7 +74,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 ];
@@ -87,10 +87,6 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale )
        }
        else
        {
-               if (lightmapExposure==0)
-               {
-                       lightmapExposure=1.0f;
-               }
                inv=1.f/lightmapExposure;
                //Exposure
 

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 1a5ba29dcefab547e2c15e8980a03e8a2159e09a..17b711b38216529aa9d42b4fc129d0678acedcb4 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -2304,7 +2304,7 @@ Q_EXTERN float                            lightmapGamma Q_ASSIGN( 1.0f );
 Q_EXTERN float                         lightmapsRGB Q_ASSIGN( qfalse );
 Q_EXTERN float                         texturesRGB 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 );
 
 /* ydnar: for runtime tweaking of falloff tolerance */