bikeshedding

Author: illwieckz

src/engine/renderer/tr_bsp.cpp

@@ -5179,6 +5179,60 @@ void RE_LoadWorldMap( const char *name )
 	tr.worldLinearizeTexture = false;
 	tr.worldLinearizeLightMap = false;
 
+	/* These are the values expected by the renderer, used for
+	"gamma correction of the map". Both were set to 0 if we had neither
+	COMPAT_ET nor COMPAT_Q3, it may be interesting to remember.
+
+	Quake 3 and Tremulous values:
+
+	  tr.overbrightBits = 1;
+	  tr.mapOverBrightBits = 2;
+	  tr.identityLight = 1.0f / ( 1 << tr.overbrightBits );
+
+	Wolfenstein: Enemy Territory values:
+
+	  tr.overbrightBits = 0;
+	  tr.mapOverBrightBits = 2;
+	  tr.identityLight = 1.0f / ( 1 << tr.overbrightBits );
+
+	Games like Quake 3 and Tremulous require tr.mapOverBrightBits
+	to be set to 2. Because this engine is primarily maintained for
+	Unvanquished and needs to keep compatibility with legacy Tremulous
+	maps, this value is set to 2.
+
+	Games like True Combat: Elite (Wolf:ET mod) or Urban Terror 4
+	(Quake 3 mod) require tr.mapOverBrightBits to be set to 0.
+
+	The mapOverBrightBits value will be read as map entity key
+	by R_LoadEntities(), making possible to override the default
+	value and properly render a map with another value than the
+	default one.
+
+	If this key is missing in map entity lump, there is no way
+	to know the required value for mapOverBrightBits when loading
+	a BSP, one may rely on arena files to do some guessing when
+	loading foreign maps and games ported to the Dæmon engine may
+	require to set a different default than what Unvanquished
+	requires.
+
+	Using a non-zero value for tr.mapOverBrightBits turns light
+	non-linear and makes deluxe mapping buggy though.
+
+	Mappers may port maps by multiplying the lights by 2.5 and set
+	the mapOverBrightBits key to 0 in map entities lump.
+
+	In legacy engines, tr.overbrightBits was non-zero when
+	hardware overbright bits were enabled, zero when disabled.
+	This engine do not implement hardware overbright bit, so
+	this is always zero, and we can remove it and simplify all
+	the computations making use of it.
+
+	Because tr.overbrightBits is always 0, tr.identityLight is
+	always 1.0f, so we entirely removed it. */
+
+	tr.mapOverBrightBits = r_overbrightDefaultExponent.Get();
+	tr.legacyOverBrightClamping = r_overbrightDefaultClamp.Get();
+
 	s_worldData = {};
 	Q_strncpyz( s_worldData.name, name, sizeof( s_worldData.name ) );
 

src/engine/renderer/tr_image.cpp

@@ -3054,59 +3054,6 @@ void R_InitImages()
 	tr.lightmaps.reserve( 128 );
 	tr.deluxemaps.reserve( 128 );
 
-	/* These are the values expected by the rest of the renderer
-	(esp. tr_bsp), used for "gamma correction of the map".
-	Both were set to 0 if we had neither COMPAT_ET nor COMPAT_Q3,
-	it may be interesting to remember.
-
-	Quake 3 and Tremulous values:
-
-	  tr.overbrightBits = 0; // Software implementation.
-	  tr.mapOverBrightBits = 2; // Quake 3 default.
-	  tr.identityLight = 1.0f / ( 1 << tr.overbrightBits );
-
-	Games like Quake 3 and Tremulous require tr.mapOverBrightBits
-	to be set to 2. Because this engine is primarily maintained for
-	Unvanquished and needs to keep compatibility with legacy Tremulous
-	maps, this value is set to 2.
-
-	Games like True Combat: Elite (Wolf:ET mod) or Urban Terror 4
-	(Quake 3 mod) require tr.mapOverBrightBits to be set to 0.
-
-	For some reasons the Wolf:ET engine sets this to 0 by default
-	but the game sets it to 2 (and requires it to be 2 for maps
-	looking as expected).
-
-	The mapOverBrightBits value will be read as map entity key
-	by R_LoadEntities() in tr_bsp, making possible to override
-	the default value and properly render a map with another
-	value than the default one.
-
-	If this key is missing in map entity lump, there is no way
-	to know the required value for mapOverBrightBits when loading
-	a BSP, one may rely on arena files to do some guessing when
-	loading foreign maps and games ported to the Dæmon engine may
-	require to set a different default than what Unvanquished
-	requires.
-
-	Using a non-zero value for tr.mapOverBrightBits turns light
-	non-linear and makes deluxe mapping buggy though.
-
-	Mappers may port and fix maps by multiplying the lights by 2.5
-	and set the mapOverBrightBits key to 0 in map entities lump.
-
-	In legacy engines, tr.overbrightBits was non-zero when
-	hardware overbright bits were enabled, zero when disabled.
-	This engine do not implement hardware overbright bit, so
-	this is always zero, and we can remove it and simplify all
-	the computations making use of it.
-
-	Because tr.overbrightBits is always 0, tr.identityLight is
-	always 1.0f. We can entirely remove it. */
-
-	tr.mapOverBrightBits = r_overbrightDefaultExponent.Get();
-	tr.legacyOverBrightClamping = r_overbrightDefaultClamp.Get();
-
 	// create default texture and white texture
 	R_CreateBuiltinImages();
 }