From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 29 Oct 2011 14:33:46 +0000 (+0200)
Subject: also new option: -sRGBtex, and renamed -sRGB to -sRGBlight
X-Git-Tag: xonotic-v0.6.0~58
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e8f27310d6e17f99f55b4fc9184f5115c90e3ec7;p=xonotic%2Fnetradiant.git

also new option: -sRGBtex, and renamed -sRGB to -sRGBlight
---

diff --git a/tools/quake3/q3map2/branch-manager b/tools/quake3/q3map2/branch-manager
deleted file mode 120000
index c4462388..00000000
--- a/tools/quake3/q3map2/branch-manager
+++ /dev/null
@@ -1 +0,0 @@
-../../../branch-manager
\ No newline at end of file
diff --git a/tools/quake3/q3map2/bsp.c b/tools/quake3/q3map2/bsp.c
index 54e14bf1..f9fe9025 100644
--- a/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@ -683,6 +683,7 @@ int BSPMain( int argc, char **argv )
 	maxSurfaceVerts = game->maxSurfaceVerts;
 	maxSurfaceIndexes = game->maxSurfaceIndexes;
 	emitFlares = game->emitFlares;
+	texturesRGB = game->texturesRGB;
 	
 	/* process arguments */
 	for( i = 1; i < (argc - 1); i++ )
@@ -918,6 +919,16 @@ int BSPMain( int argc, char **argv )
 			Sys_Printf( "Debug portal surfaces enabled\n" );
 			debugPortals = qtrue;
 		}
+		else if( !strcmp( argv[ i ], "-sRGBtex" ) )
+		{
+			texturesRGB = qtrue;
+			Sys_Printf( "Textures are in sRGB\n" );
+		}
+		else if( !strcmp( argv[ i ], "-nosRGBtex" ) )
+		{
+			texturesRGB = qfalse;
+			Sys_Printf( "Textures are linear\n" );
+		}
 		else if( !strcmp( argv[ i ], "-altsplit" ) )
 		{
 			Sys_Printf( "Alternate BSP splitting (by 27) enabled\n" );
diff --git a/tools/quake3/q3map2/game__null.h b/tools/quake3/q3map2/game__null.h
index 0bc61e3a..5ff6aba7 100644
--- a/tools/quake3/q3map2/game__null.h
+++ b/tools/quake3/q3map2/game__null.h
@@ -64,6 +64,7 @@ game_t struct
 	0,			/* lightmap width/height */
 	0,			/* lightmap gamma */
 	qfalse,			/* lightmap sRGB */
+	qfalse,			/* texture sRGB */
 	0,			/* lightmap exposure */
 	0,			/* lightmap compensate */
 	0,			/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_darkplaces.h b/tools/quake3/q3map2/game_darkplaces.h
index 653beb10..ab73baa7 100644
--- a/tools/quake3/q3map2/game_darkplaces.h
+++ b/tools/quake3/q3map2/game_darkplaces.h
@@ -55,6 +55,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	200.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	0.3f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_dq.h b/tools/quake3/q3map2/game_dq.h
index 3d6cfe49..6507aec1 100644
--- a/tools/quake3/q3map2/game_dq.h
+++ b/tools/quake3/q3map2/game_dq.h
@@ -55,6 +55,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.2f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	200.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	0.3f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_ef.h b/tools/quake3/q3map2/game_ef.h
index 4c08ab09..11136642 100644
--- a/tools/quake3/q3map2/game_ef.h
+++ b/tools/quake3/q3map2/game_ef.h
@@ -114,6 +114,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_etut.h b/tools/quake3/q3map2/game_etut.h
index ff791620..38bc083d 100644
--- a/tools/quake3/q3map2/game_etut.h
+++ b/tools/quake3/q3map2/game_etut.h
@@ -149,6 +149,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qtrue,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB (yes, this is incorrect, but we better match ET:UT) */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_ja.h b/tools/quake3/q3map2/game_ja.h
index 7f4a5fcc..3a1a4d48 100644
--- a/tools/quake3/q3map2/game_ja.h
+++ b/tools/quake3/q3map2/game_ja.h
@@ -68,6 +68,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_jk2.h b/tools/quake3/q3map2/game_jk2.h
index 30bb3d3b..4dd4d845 100644
--- a/tools/quake3/q3map2/game_jk2.h
+++ b/tools/quake3/q3map2/game_jk2.h
@@ -65,6 +65,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_nexuiz.h b/tools/quake3/q3map2/game_nexuiz.h
index 8e0785d9..386cfd03 100644
--- a/tools/quake3/q3map2/game_nexuiz.h
+++ b/tools/quake3/q3map2/game_nexuiz.h
@@ -64,6 +64,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_prophecy.h b/tools/quake3/q3map2/game_prophecy.h
index a1a4c4b5..6d8b0a21 100644
--- a/tools/quake3/q3map2/game_prophecy.h
+++ b/tools/quake3/q3map2/game_prophecy.h
@@ -55,6 +55,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	200.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	0.4f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_qfusion.h b/tools/quake3/q3map2/game_qfusion.h
index 0fd336c6..681f75d7 100644
--- a/tools/quake3/q3map2/game_qfusion.h
+++ b/tools/quake3/q3map2/game_qfusion.h
@@ -116,6 +116,7 @@ game_t struct
 	512,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_quake3.h b/tools/quake3/q3map2/game_quake3.h
index be09468d..76b3ff37 100644
--- a/tools/quake3/q3map2/game_quake3.h
+++ b/tools/quake3/q3map2/game_quake3.h
@@ -113,6 +113,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_quakelive.h b/tools/quake3/q3map2/game_quakelive.h
index a9425a8f..ba781cdc 100644
--- a/tools/quake3/q3map2/game_quakelive.h
+++ b/tools/quake3/q3map2/game_quakelive.h
@@ -65,6 +65,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_reaction.h b/tools/quake3/q3map2/game_reaction.h
index 97b01c48..ea59e358 100644
--- a/tools/quake3/q3map2/game_reaction.h
+++ b/tools/quake3/q3map2/game_reaction.h
@@ -85,6 +85,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_sof2.h b/tools/quake3/q3map2/game_sof2.h
index e7453f8d..98081da6 100644
--- a/tools/quake3/q3map2/game_sof2.h
+++ b/tools/quake3/q3map2/game_sof2.h
@@ -140,6 +140,7 @@ game_t struct
 	128,					/* lightmap width/height */
 	1.0f,					/* lightmap gamma */
 	qfalse,					/* lightmap sRGB */
+	qfalse,					/* texture sRGB */
 	1.0f,					/* lightmap exposure */
 	1.0f,					/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_tenebrae.h b/tools/quake3/q3map2/game_tenebrae.h
index 2117aa45..9e0658f1 100644
--- a/tools/quake3/q3map2/game_tenebrae.h
+++ b/tools/quake3/q3map2/game_tenebrae.h
@@ -113,6 +113,7 @@ game_t struct
 	512,				/* lightmap width/height */
 	2.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_tremulous.h b/tools/quake3/q3map2/game_tremulous.h
index 9a1cb796..08027fe6 100644
--- a/tools/quake3/q3map2/game_tremulous.h
+++ b/tools/quake3/q3map2/game_tremulous.h
@@ -71,6 +71,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_wolf.h b/tools/quake3/q3map2/game_wolf.h
index fc55c884..94339e65 100644
--- a/tools/quake3/q3map2/game_wolf.h
+++ b/tools/quake3/q3map2/game_wolf.h
@@ -130,6 +130,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_wolfet.h b/tools/quake3/q3map2/game_wolfet.h
index fdda4d95..bcb30985 100644
--- a/tools/quake3/q3map2/game_wolfet.h
+++ b/tools/quake3/q3map2/game_wolfet.h
@@ -67,6 +67,7 @@ game_t struct
 	128,				/* lightmap width/height */
 	1.0f,				/* lightmap gamma */
 	qfalse,				/* lightmap sRGB */
+	qfalse,				/* texture sRGB */
 	1.0f,				/* lightmap exposure */
 	1.0f,				/* lightmap compensate */
 	1.0f,				/* lightgrid scale */
diff --git a/tools/quake3/q3map2/game_xonotic.h b/tools/quake3/q3map2/game_xonotic.h
index 83d7715f..25121930 100644
--- a/tools/quake3/q3map2/game_xonotic.h
+++ b/tools/quake3/q3map2/game_xonotic.h
@@ -64,6 +64,7 @@ game_t struct
 	128, /* lightmap width/height */
 	1.0f, /* lightmap gamma */
 	qfalse, /* lightmap sRGB */
+	qfalse, /* texture sRGB */
 	1.0f, /* lightmap exposure */
 	1.0f, /* lightmap compensate */
 	1.0f, /* lightgrid scale */
diff --git a/tools/quake3/q3map2/light.c b/tools/quake3/q3map2/light.c
index ffdd5008..c7f1e722 100644
--- a/tools/quake3/q3map2/light.c
+++ b/tools/quake3/q3map2/light.c
@@ -2077,6 +2077,12 @@ int LightMain( int argc, char **argv )
 	else
 		Sys_Printf( " lightmap colorspace: linear\n" );
 
+	texturesRGB = game->texturesRGB;
+	if(texturesRGB)
+		Sys_Printf( " texture colorspace: sRGB\n" );
+	else
+		Sys_Printf( " texture colorspace: linear\n" );
+
 	lightmapCompensate = game->lightmapCompensate;
 	Sys_Printf( " lightning compensation: %f\n", lightmapCompensate );
 
@@ -2235,18 +2241,30 @@ int LightMain( int argc, char **argv )
 			i++;
 		}
 		
-		else if( !strcmp( argv[ i ], "-sRGB" ) )
+		else if( !strcmp( argv[ i ], "-sRGBlight" ) )
 		{
 			lightmapsRGB = qtrue;
 			Sys_Printf( "Lighting is in sRGB\n" );
 		}
 
-		else if( !strcmp( argv[ i ], "-nosRGB" ) )
+		else if( !strcmp( argv[ i ], "-nosRGBlight" ) )
 		{
 			lightmapsRGB = qfalse;
 			Sys_Printf( "Lighting is linear\n" );
 		}
 
+		else if( !strcmp( argv[ i ], "-sRGBtex" ) )
+		{
+			texturesRGB = qtrue;
+			Sys_Printf( "Textures are in sRGB\n" );
+		}
+
+		else if( !strcmp( argv[ i ], "-nosRGBtex" ) )
+		{
+			texturesRGB = qfalse;
+			Sys_Printf( "Textures are linear\n" );
+		}
+
 		else if( !strcmp( argv[ i ], "-exposure" ) )
 		{
 			f = atof( argv[ i + 1 ] );
diff --git a/tools/quake3/q3map2/light_bounce.c b/tools/quake3/q3map2/light_bounce.c
index 0e59ddeb..d78c6dee 100644
--- a/tools/quake3/q3map2/light_bounce.c
+++ b/tools/quake3/q3map2/light_bounce.c
@@ -233,6 +233,14 @@ qboolean RadSampleImage( byte *pixels, int width, int height, float st[ 2 ], flo
 	pixels += (y * width * 4) + (x * 4);
 	VectorCopy( pixels, color );
 	color[ 3 ] = pixels[ 3 ];
+
+	if(texturesRGB)
+	{
+		color[0] = Image_LinearFloatFromsRGBFloat(color[0] * (1.0 / 255.0)) * 255.0;
+		color[1] = Image_LinearFloatFromsRGBFloat(color[1] * (1.0 / 255.0)) * 255.0;
+		color[2] = Image_LinearFloatFromsRGBFloat(color[2] * (1.0 / 255.0)) * 255.0;
+	}
+
 	return qtrue;
 }
 
diff --git a/tools/quake3/q3map2/light_ydnar.c b/tools/quake3/q3map2/light_ydnar.c
index 09a8e484..b01084df 100644
--- a/tools/quake3/q3map2/light_ydnar.c
+++ b/tools/quake3/q3map2/light_ydnar.c
@@ -44,7 +44,6 @@ ColorToBytes()
 ydnar: moved to here 2001-02-04
 */
 
-#define Image_sRGBFloatFromLinear(c) (((c) < 0.8014848f) ? (c) * 0.05046875f : 1.055f * (float)pow((c)*(1.0f/256.0f), 1.0f/2.4f) - 0.055f)
 void ColorToBytes( const float *color, byte *colorBytes, float scale )
 {
 	int		i;
@@ -125,9 +124,9 @@ void ColorToBytes( const float *color, byte *colorBytes, float scale )
 	/* sRGB lightmaps */
 	if(lightmapsRGB)
 	{
-		sample[0] = floor(Image_sRGBFloatFromLinear(sample[0]) * 255.0 + 0.5);
-		sample[1] = floor(Image_sRGBFloatFromLinear(sample[1]) * 255.0 + 0.5);
-		sample[2] = floor(Image_sRGBFloatFromLinear(sample[2]) * 255.0 + 0.5);
+		sample[0] = floor(Image_sRGBFloatFromLinearFloat(sample[0] * (1.0 / 255.0)) * 255.0 + 0.5);
+		sample[1] = floor(Image_sRGBFloatFromLinearFloat(sample[1] * (1.0 / 255.0)) * 255.0 + 0.5);
+		sample[2] = floor(Image_sRGBFloatFromLinearFloat(sample[2] * (1.0 / 255.0)) * 255.0 + 0.5);
 	}
 	
 	/* store it off */
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 9172415e..8c240ea8 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -566,6 +566,7 @@ typedef struct game_s
 	int					lightmapSize;					/* bsp lightmap width/height */
 	float				lightmapGamma;					/* default lightmap gamma */
 	qboolean			lightmapsRGB;					/* default lightmap sRGB mode */
+	qboolean			texturesRGB;					/* default texture 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) */
@@ -2298,6 +2299,7 @@ Q_EXTERN qboolean			inGrid Q_ASSIGN(0);
 /* ydnar: lightmap gamma/compensation */
 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				lightmapExposure Q_ASSIGN( 1.0f );
 Q_EXTERN float				lightmapCompensate Q_ASSIGN( 1.0f );
 
@@ -2540,5 +2542,8 @@ Q_EXTERN bspAdvertisement_t	bspAds[ MAX_MAP_ADVERTISEMENTS ];
 
 #define AUTOEXPAND_BY_REALLOC_BSP(suffix, def) AUTOEXPAND_BY_REALLOC(bsp##suffix, numBSP##suffix, allocatedBSP##suffix, def)
 
+#define Image_LinearFloatFromsRGBFloat(c) (((c) <= 0.04045f) ? (c) * (1.0f / 12.92f) : (float)pow(((c) + 0.055f)*(1.0f/1.055f), 2.4f))
+#define Image_sRGBFloatFromLinearFloat(c) (((c) < 0.0031308f) ? (c) * 12.92f : 1.055f * (float)pow((c), 1.0f/2.4f) - 0.055f)
+
 /* end marker */
 #endif