Some renderer refactor and cleanup

- r_shadeMethod : 0/1 = q3 behavior, 2 = ue1-ish behavior, 3 = mix of 1 and 2, -1 = one uniform color, 150-666 = a lod range to change between the 3
- r_monolightmaps : refactor - goes to the light data instead of the calculations and images
- removed r_greyscale because this is a data-modifying novelty that would complicate support for loading compressed texture formats. This is better off as a post-process shader
- environment mapping refactor, rewrite and cleanup
- removed a lot of deprecated rgbGens
- removed r_texdump (it never worked)
- remove a few leftover broken postprocess things

Author: leilei-

code/client/cl_scrn.c

@@ -93,7 +93,6 @@ leilei - Adjusted for resolution and screen aspect ratio.... but from vertical o
 ================
 */
 void SCR_AdjustFrom480( float *x, float *y, float *w, float *h ) {
-	float	xscale;
 	float	yscale;
 
 	// scale for screen sizes
@@ -202,14 +201,8 @@ void SCR_DrawSmallChar( int x, int y, int ch, int scalemode ) {
 		float frow, fcol;
 		float	ax, ay, aw, ah;
 		float size;
-		float sizeup = 1.0f;
-		float sizedown = 1.0f;
 		ch &= 255;
 
-		if (cls.glconfig.vidHeight >= 480)
-		sizeup = cls.glconfig.vidHeight / 480; 
-		sizedown = (cls.glconfig.vidHeight - 480);
-
 		if ( ch == ' ' ) {
 			return;
 		}

code/renderer_oa/tr_bloom.c

@@ -1277,58 +1277,3 @@ void R_AltBrightnessInit( void )
 	r_alternateBrightness = ri.Cvar_Get( "r_alternateBrightness", "0", CVAR_ARCHIVE | CVAR_LATCH);
 }
 
-
-
-// =================================================================
-// WATER BUFFER TEST
-// =================================================================
-
-#if 0
-static struct {
-	// NO!
-} water;
-
-// leilei - experimental water effect
-static void R_Water_InitTextures( void )
-{
-	// NO!
-}
-#endif
-
-
-
-void R_InitWaterTextures( void )
-{
-	// NO!
-}
-
-
-#if 0
-static void R_Water_BackupScreen( void )
-{
-	// NO!
-}
-
-static void R_WaterWorks( void )
-{
-	// NO!
-}
-
-
-static void R_Water_RestoreScreen( void )
-{
-	// NO!
-}
-#endif
-
-void R_WaterInit( void )
-{
-	// NO!
-}
-
-
-void R_WaterScreen( void )
-{
-	// NO!
-}
-

code/renderer_oa/tr_bsp.c

@@ -108,6 +108,17 @@ static	void R_ColorShiftLightingBytes( byte in[4], byte out[4] ) {
 	r = in[0] << shift;
 	g = in[1] << shift;
 	b = in[2] << shift;
+
+	// leilei - handle light desaturation here instead, so we can also mono the lightgrid and have one less redundant clamp
+	if( r_monolightmaps->value > 0)
+	{
+		float saturated = (r * 0.22126) + (g * 0.7152) + (b * 0.0722);
+		float ml = r_monolightmaps->value; // sanitize
+		if (ml>1) ml=1; if (ml<0) ml=0;
+		r = saturated + (r - saturated) * ( 1-ml );
+		g = saturated + (g - saturated) * ( 1-ml );
+		b = saturated + (b - saturated) * ( 1-ml );
+	}
 
 	if (r_lightmapColorNorm->integer == 2)	 // leilei 
 	{
@@ -341,7 +352,6 @@ static shader_t *ShaderForShaderNum( int shaderNum, int lightmapNum ) {
 		// leilei - placeholder hack
 		if (tr.placeholderTextureAvail == 1 && !Q_strncmp( dsh->shader, "textures", 8 ))
 		{
-	//	return tr.placeholderTextureShader;
 		shader = R_FindShader( "placeholder_texture", lightmapNum, qtrue );
 		return shader;
 		}