option: -sRGBcolor (unused yet)
authorRudolf Polzer <divverent@alientrap.org>
Wed, 14 Dec 2011 08:27:49 +0000 (09:27 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 14 Dec 2011 08:51:15 +0000 (09:51 +0100)
22 files changed:
tools/quake3/q3map2/bsp.c
tools/quake3/q3map2/game__null.h
tools/quake3/q3map2/game_darkplaces.h
tools/quake3/q3map2/game_dq.h
tools/quake3/q3map2/game_ef.h
tools/quake3/q3map2/game_etut.h
tools/quake3/q3map2/game_ja.h
tools/quake3/q3map2/game_jk2.h
tools/quake3/q3map2/game_nexuiz.h
tools/quake3/q3map2/game_prophecy.h
tools/quake3/q3map2/game_qfusion.h
tools/quake3/q3map2/game_quake3.h
tools/quake3/q3map2/game_quakelive.h
tools/quake3/q3map2/game_reaction.h
tools/quake3/q3map2/game_sof2.h
tools/quake3/q3map2/game_tenebrae.h
tools/quake3/q3map2/game_tremulous.h
tools/quake3/q3map2/game_wolf.h
tools/quake3/q3map2/game_wolfet.h
tools/quake3/q3map2/game_xonotic.h
tools/quake3/q3map2/light.c
tools/quake3/q3map2/q3map2.h

index e1b1e2f..8fe5966 100644 (file)
@@ -684,6 +684,7 @@ int BSPMain( int argc, char **argv )
        maxSurfaceIndexes = game->maxSurfaceIndexes;
        emitFlares = game->emitFlares;
        texturesRGB = game->texturesRGB;
+       colorsRGB = game->colorsRGB;
        
        /* process arguments */
        for( i = 1; i < (argc - 1); i++ )
@@ -934,6 +935,16 @@ int BSPMain( int argc, char **argv )
                        texturesRGB = qfalse;
                        Sys_Printf( "Textures are linear\n" );
                }
+               else if( !strcmp( argv[ i ], "-sRGBcolor" ) )
+               {
+                       colorsRGB = qtrue;
+                       Sys_Printf( "Colors are in sRGB\n" );
+               }
+               else if( !strcmp( argv[ i ], "-nosRGBcolor" ) )
+               {
+                       colorsRGB = qfalse;
+                       Sys_Printf( "Colors are linear\n" );
+               }
                else if( !strcmp( argv[ i ], "-altsplit" ) )
                {
                        Sys_Printf( "Alternate BSP splitting (by 27) enabled\n" );
index 5ff6aba..0f1a2a7 100644 (file)
@@ -65,6 +65,7 @@ game_t struct
        0,                      /* lightmap gamma */
        qfalse,                 /* lightmap sRGB */
        qfalse,                 /* texture sRGB */
+       qfalse,                 /* color sRGB */
        0,                      /* lightmap exposure */
        0,                      /* lightmap compensate */
        0,                      /* lightgrid scale */
index ab73baa..1e09440 100644 (file)
@@ -56,6 +56,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        200.0f,                         /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        0.3f,                           /* lightgrid scale */
index 6507aec..92b4014 100644 (file)
@@ -56,6 +56,7 @@ game_t struct
        1.2f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        200.0f,                         /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        0.3f,                           /* lightgrid scale */
index 1113664..7800f2b 100644 (file)
@@ -115,6 +115,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 38bc083..ebc0b92 100644 (file)
@@ -150,6 +150,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qtrue,                          /* lightmap sRGB */
        qfalse,                         /* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 3a1a4d4..daf1f80 100644 (file)
@@ -69,6 +69,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 4dd4d84..b56e6e1 100644 (file)
@@ -66,6 +66,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 386cfd0..dcfc0a2 100644 (file)
@@ -65,6 +65,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 6d8b0a2..9de1114 100644 (file)
@@ -56,6 +56,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        200.0f,                         /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        0.4f,                           /* lightgrid scale */
index 681f75d..1a2c926 100644 (file)
@@ -117,6 +117,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 76b3ff3..90a066e 100644 (file)
@@ -114,6 +114,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index ba781cd..e6703fc 100644 (file)
@@ -66,6 +66,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index ea59e35..55b19c3 100644 (file)
@@ -86,6 +86,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 98081da..adce6b6 100644 (file)
@@ -141,6 +141,7 @@ game_t struct
        1.0f,                                   /* lightmap gamma */
        qfalse,                                 /* lightmap sRGB */
        qfalse,                                 /* texture sRGB */
+       qfalse,                                 /* color sRGB */
        1.0f,                                   /* lightmap exposure */
        1.0f,                                   /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 9e0658f..081c9c4 100644 (file)
@@ -114,6 +114,7 @@ game_t struct
        2.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 08027fe..a74c539 100644 (file)
@@ -72,6 +72,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 94339e6..d16e2db 100644 (file)
@@ -131,6 +131,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index bcb3098..f6c69d1 100644 (file)
@@ -68,6 +68,7 @@ game_t struct
        1.0f,                           /* lightmap gamma */
        qfalse,                         /* lightmap sRGB */
        qfalse,                         /* texture sRGB */
+       qfalse,                         /* color sRGB */
        1.0f,                           /* lightmap exposure */
        1.0f,                           /* lightmap compensate */
        1.0f,                           /* lightgrid scale */
index 2512193..3e13204 100644 (file)
@@ -65,6 +65,7 @@ game_t struct
        1.0f, /* lightmap gamma */
        qfalse, /* lightmap sRGB */
        qfalse, /* texture sRGB */
+       qfalse, /* color sRGB */
        1.0f, /* lightmap exposure */
        1.0f, /* lightmap compensate */
        1.0f, /* lightgrid scale */
index f4a735c..67c0b4c 100644 (file)
@@ -2083,6 +2083,12 @@ int LightMain( int argc, char **argv )
        else
                Sys_Printf( " texture colorspace: linear\n" );
 
+       colorsRGB = game->colorsRGB;
+       if(colorsRGB)
+               Sys_Printf( " _color colorspace: sRGB\n" );
+       else
+               Sys_Printf( " _color colorspace: linear\n" );
+
        lightmapCompensate = game->lightmapCompensate;
        Sys_Printf( " lightning compensation: %f\n", lightmapCompensate );
 
@@ -2259,6 +2265,18 @@ int LightMain( int argc, char **argv )
                        Sys_Printf( "Textures are linear\n" );
                }
 
+               else if( !strcmp( argv[ i ], "-sRGBcolor" ) )
+               {
+                       colorsRGB = qtrue;
+                       Sys_Printf( "Colors are in sRGB\n" );
+               }
+
+               else if( !strcmp( argv[ i ], "-nosRGBcolor" ) )
+               {
+                       colorsRGB = qfalse;
+                       Sys_Printf( "Colors are linear\n" );
+               }
+
                else if( !strcmp( argv[ i ], "-exposure" ) )
                {
                        f = atof( argv[ i + 1 ] );
index 720d63b..58a6d2f 100644 (file)
@@ -567,6 +567,7 @@ typedef struct game_s
        float                           lightmapGamma;                                  /* default lightmap gamma */
        qboolean                        lightmapsRGB;                                   /* default lightmap sRGB mode */
        qboolean                        texturesRGB;                                    /* default texture sRGB mode */
+       qboolean                        colorsRGB;                                      /* default color sRGB mode */
        float                           lightmapExposure;                               /* default lightmap exposure */
        float                           lightmapCompensate;                             /* default lightmap compensate value */
        float                           gridScale;                                              /* vortex: default lightgrid scale (affects both directional and ambient spectres) */
@@ -2302,6 +2303,7 @@ Q_EXTERN qboolean                 inGrid Q_ASSIGN(0);
 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                         lightmapCompensate Q_ASSIGN( 1.0f );