From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 9 Dec 2011 15:18:17 +0000 (+0100)
Subject: -autolevel for minimap
X-Git-Tag: xonotic-v0.6.0~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c3a3978aea07decec74ca6129eacd5351780a4fa;p=xonotic%2Fnetradiant.git

-autolevel for minimap
---

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index 5ee35cd5..09c3fefc 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -75,7 +75,7 @@ typedef struct minimap_s
 	float *sample_offsets;
 	float sharpen_boxmult;
 	float sharpen_centermult;
-	float boost;
+	float boost, brightness, contrast;
 	float *data1f;
 	float *sharpendata1f;
 	vec3_t mins, size;
@@ -303,6 +303,17 @@ static void MiniMapContrastBoost(int y)
 	}
 }
 
+static void MiniMapBrightnessContrast(int y)
+{
+	int x;
+	float *q = &minimap.data1f[y * minimap.width];
+	for(x = 0; x < minimap.width; ++x)
+	{
+		*q = *q * minimap.contrast + minimap.brightness;
+		++q;
+	}
+}
+
 void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in, float border, qboolean keepaspect)
 {
 	vec3_t mins, maxs, extend;
@@ -540,6 +551,7 @@ int MiniMapBSPMain( int argc, char **argv )
 	char basename[1024];
 	char path[1024];
 	char relativeMinimapFilename[1024];
+	qboolean autolevel;
 	float minimapSharpen;
 	float border;
 	byte *data4b, *p;
@@ -577,9 +589,12 @@ int MiniMapBSPMain( int argc, char **argv )
 	keepaspect = game->miniMapKeepAspect;
 	mode = game->miniMapMode;
 
+	autolevel = qfalse;
 	minimap.samples = 1;
 	minimap.sample_offsets = NULL;
 	minimap.boost = 1.0;
+	minimap.brightness = 0.0;
+	minimap.contrast = 1.0;
 
 	/* process arguments */
 	for( i = 1; i < (argc - 1); i++ )
@@ -663,12 +678,34 @@ int MiniMapBSPMain( int argc, char **argv )
 			mode = MINIMAP_MODE_WHITE;
 			Sys_Printf( "Writing as white alpha image\n" );
  		}
-		else if( !strcmp( argv[ i ],  "-boost" ) )
+		else if( !strcmp( argv[ i ],  "-boost" ) && i < (argc - 2) )
  		{
 			minimap.boost = atof(argv[i + 1]);
 			i++;
 			Sys_Printf( "Contrast boost set to %f\n", minimap.boost );
  		}
+		else if( !strcmp( argv[ i ],  "-brightness" ) && i < (argc - 2) )
+ 		{
+			minimap.brightness = atof(argv[i + 1]);
+			i++;
+			Sys_Printf( "Brightness set to %f\n", minimap.brightness );
+ 		}
+		else if( !strcmp( argv[ i ],  "-contrast" ) && i < (argc - 2) )
+ 		{
+			minimap.contrast = atof(argv[i + 1]);
+			i++;
+			Sys_Printf( "Contrast set to %f\n", minimap.contrast );
+ 		}
+		else if( !strcmp( argv[ i ],  "-autolevel" ) )
+ 		{
+			autolevel = qtrue;
+			Sys_Printf( "Auto level enabled\n", border );
+ 		}
+		else if( !strcmp( argv[ i ],  "-noautolevel" ) )
+ 		{
+			autolevel = qfalse;
+			Sys_Printf( "Auto level disabled\n", border );
+ 		}
 	}
 
 	MiniMapMakeMinsMaxs(mins, maxs, border, keepaspect);
@@ -722,6 +759,44 @@ int MiniMapBSPMain( int argc, char **argv )
 		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapContrastBoost);
 	}
 
+	if(autolevel)
+	{
+		Sys_Printf( "\n--- MiniMapAutoLevel (%d) ---\n", minimap.height );
+		float mi = 1, ma = 0;
+		float s, o;
+
+		// TODO threads!
+		for(y = 0; y < minimap.height; ++y)
+			for(x = 0; x < minimap.width; ++x)
+			{
+				float v = *q++;
+				if(v < mi)
+					mi = v;
+				if(v > ma)
+					ma = v;
+			}
+		s = 1 / (ma - mi);
+		o = mi / (ma - mi);
+
+		// equations:
+		//   brightness + contrast * v
+		// after autolevel:
+		//   brightness + contrast * (v * s - o)
+		// =
+		//   (brightness - contrast * o) + (contrast * s) * v
+		minimap.brightness = minimap.brightness - minimap.contrast * o;
+		minimap.contrast *= s;
+
+		Sys_Printf( "Auto level: Brightness changed to %f\n", minimap.boost );
+		Sys_Printf( "Auto level: Contrast changed to %f\n", minimap.contrast );
+	}
+
+	if(minimap.brightness != 0 || minimap.contrast != 1)
+	{
+		Sys_Printf( "\n--- MiniMapBrightnessContrast (%d) ---\n", minimap.height );
+		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapBrightnessContrast);
+	}
+
 	if(minimap.sharpendata1f)
 	{
 		Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height );