X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmain.c;h=b8c469dbdbd16e0188dbe8c8125efe4ee7601f9f;hb=870333585c699ba2915285311c284ef1b4a2f38e;hp=c50de9314aebd8d7b1a900848a7208ef10a82f43;hpb=0298900c31b26a52dbcc63edab4bd47c449345f2;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index c50de931..b8c469db 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -1,4 +1,4 @@
-/* -------------------------------------------------------------------------------
+/* -------------------------------------------------------------------------------;
 
 Copyright (C) 1999-2007 id Software, Inc. and contributors.
 For a list of contributors, see the accompanying CONTRIBUTORS file.
@@ -66,8 +66,6 @@ static void ExitQ3Map( void )
 
 /* minimap stuff */
 
-/* borrowed from light.c */
-void WriteTGA24( char *filename, byte *data, int width, int height, qboolean flip );
 typedef struct minimap_s
 {
 	bspModel_t *model;
@@ -77,6 +75,7 @@ typedef struct minimap_s
 	float *sample_offsets;
 	float sharpen_boxmult;
 	float sharpen_centermult;
+	float boost, brightness, contrast;
 	float *data1f;
 	float *sharpendata1f;
 	vec3_t mins, size;
@@ -137,6 +136,7 @@ static float MiniMapSample(float x, float y)
 	float t0, t1;
 	float samp;
 	bspBrush_t *b;
+	bspBrushSide_t *s;
 	int cnt;
 
 	org[0] = x;
@@ -156,7 +156,7 @@ static float MiniMapSample(float x, float y)
 			b = &bspBrushes[bi];
 
 			// sort out mins/maxs of the brush
-			bspBrushSide_t *s = &bspBrushSides[b->firstSide];
+			s = &bspBrushSides[b->firstSide];
 			if(x < -bspPlanes[s[0].planeNum].dist)
 				continue;
 			if(x > +bspPlanes[s[1].planeNum].dist)
@@ -177,13 +177,25 @@ static float MiniMapSample(float x, float y)
 	return samp;
 }
 
-static void MiniMapRandomlySubsampled(int y)
+void RandomVector2f(float v[2])
+{
+	do
+	{
+		v[0] = 2 * Random() - 1;
+		v[1] = 2 * Random() - 1;
+	}
+	while(v[0] * v[0] + v[1] * v[1] > 1);
+}
+
+static void MiniMapRandomlySupersampled(int y)
 {
 	int x, i;
 	float *p = &minimap.data1f[y * minimap.width];
 	float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height);
 	float dx   =                   minimap.size[0]      / (float) minimap.width;
 	float dy   =                   minimap.size[1]      / (float) minimap.height;
+	float uv[2];
+	float thisval;
 
 	for(x = 0; x < minimap.width; ++x)
 	{
@@ -192,9 +204,10 @@ static void MiniMapRandomlySubsampled(int y)
 
 		for(i = 0; i < minimap.samples; ++i)
 		{
-			float thisval = MiniMapSample(
-				xmin + Random() * dx,
-				ymin + Random() * dy
+			RandomVector2f(uv);
+			thisval = MiniMapSample(
+				xmin + (uv[0] + 0.5) * dx, /* exaggerated random pattern for better results */
+				ymin + (uv[1] + 0.5) * dy  /* exaggerated random pattern for better results */
 			);
 			val += thisval;
 		}
@@ -203,7 +216,7 @@ static void MiniMapRandomlySubsampled(int y)
 	}
 }
 
-static void MiniMapSubsampled(int y)
+static void MiniMapSupersampled(int y)
 {
 	int x, i;
 	float *p = &minimap.data1f[y * minimap.width];
@@ -229,15 +242,15 @@ static void MiniMapSubsampled(int y)
 	}
 }
 
-static void MiniMapNoSubsampling(int y)
+static void MiniMapNoSupersampling(int y)
 {
 	int x;
 	float *p = &minimap.data1f[y * minimap.width];
-	float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height);
+	float ymin = minimap.mins[1] + minimap.size[1] * ((y + 0.5) / (float) minimap.height);
 
 	for(x = 0; x < minimap.width; ++x)
 	{
-		float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
+		float xmin = minimap.mins[0] + minimap.size[0] * ((x + 0.5) / (float) minimap.width);
 		*p++ = MiniMapSample(xmin, ymin) / minimap.size[2];
 	}
 }
@@ -279,30 +292,57 @@ static void MiniMapSharpen(int y)
 	}
 }
 
-void MiniMapMakeMinsMaxs()
+static void MiniMapContrastBoost(int y)
+{
+	int x;
+	float *q = &minimap.data1f[y * minimap.width];
+	for(x = 0; x < minimap.width; ++x)
+	{
+		*q = *q * minimap.boost / ((minimap.boost - 1) * *q + 1);
+		++q;
+	}
+}
+
+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;
-	VectorCopy(minimap.model->mins, mins);
-	VectorCopy(minimap.model->maxs, maxs);
+	VectorCopy(mins_in, mins);
+	VectorCopy(maxs_in, maxs);
 
 	// line compatible to nexuiz mapinfo
 	Sys_Printf("size %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
 
-	VectorSubtract(maxs, mins, extend);
-
-	if(extend[1] > extend[0])
-	{
-		mins[0] -= (extend[1] - extend[0]) * 0.5;
-		maxs[0] += (extend[1] - extend[0]) * 0.5;
-	}
-	else
+	if(keepaspect)
 	{
-		mins[1] -= (extend[0] - extend[1]) * 0.5;
-		maxs[1] += (extend[0] - extend[1]) * 0.5;
+		VectorSubtract(maxs, mins, extend);
+		if(extend[1] > extend[0])
+		{
+			mins[0] -= (extend[1] - extend[0]) * 0.5;
+			maxs[0] += (extend[1] - extend[0]) * 0.5;
+		}
+		else
+		{
+			mins[1] -= (extend[0] - extend[1]) * 0.5;
+			maxs[1] += (extend[0] - extend[1]) * 0.5;
+		}
 	}
 
+	/* border: amount of black area around the image */
+	/* input: border, 1-2*border, border but we need border/(1-2*border) */
+
 	VectorSubtract(maxs, mins, extend);
-	VectorScale(extend, 1.0 / 64.0, extend);
+	VectorScale(extend, border / (1 - 2 * border), extend);
 
 	VectorSubtract(mins, extend, mins);
 	VectorAdd(maxs, extend, maxs);
@@ -314,19 +354,161 @@ void MiniMapMakeMinsMaxs()
 	Sys_Printf("size_texcoords %f %f %f %f %f %f\n", mins[0], mins[1], mins[2], maxs[0], maxs[1], maxs[2]);
 }
 
+/*
+MiniMapSetupBrushes()
+determines solid non-sky brushes in the world
+*/
+
+void MiniMapSetupBrushes( void )
+{
+	SetupBrushesFlags(C_SOLID | C_SKY, C_SOLID, 0, 0);
+		// at least one must be solid
+		// none may be sky
+		// not all may be nodraw
+}
+
+qboolean MiniMapEvaluateSampleOffsets(int *bestj, int *bestk, float *bestval)
+{
+	float val, dx, dy;
+	int j, k;
+
+	*bestj = *bestk = -1;
+	*bestval = 3; /* max possible val is 2 */
+
+	for(j = 0; j < minimap.samples; ++j)
+		for(k = j + 1; k < minimap.samples; ++k)
+		{
+			dx = minimap.sample_offsets[2*j+0] - minimap.sample_offsets[2*k+0];
+			dy = minimap.sample_offsets[2*j+1] - minimap.sample_offsets[2*k+1];
+			if(dx > +0.5) dx -= 1;
+			if(dx < -0.5) dx += 1;
+			if(dy > +0.5) dy -= 1;
+			if(dy < -0.5) dy += 1;
+			val = dx * dx + dy * dy;
+			if(val < *bestval)
+			{
+				*bestj = j;
+				*bestk = k;
+				*bestval = val;
+			}
+		}
+	
+	return *bestval < 3;
+}
+
+void MiniMapMakeSampleOffsets()
+{
+	int i, j, k, jj, kk;
+	float val, valj, valk, sx, sy, rx, ry;
+
+	Sys_Printf( "Generating good sample offsets (this may take a while)...\n" );
+
+	/* start with entirely random samples */
+	for(i = 0; i < minimap.samples; ++i)
+	{
+		minimap.sample_offsets[2*i+0] = Random();
+		minimap.sample_offsets[2*i+1] = Random();
+	}
+
+	for(i = 0; i < 1000; ++i)
+	{
+		if(MiniMapEvaluateSampleOffsets(&j, &k, &val))
+		{
+			sx = minimap.sample_offsets[2*j+0];
+			sy = minimap.sample_offsets[2*j+1];
+			minimap.sample_offsets[2*j+0] = rx = Random();
+			minimap.sample_offsets[2*j+1] = ry = Random();
+			if(!MiniMapEvaluateSampleOffsets(&jj, &kk, &valj))
+				valj = -1;
+			minimap.sample_offsets[2*j+0] = sx;
+			minimap.sample_offsets[2*j+1] = sy;
+
+			sx = minimap.sample_offsets[2*k+0];
+			sy = minimap.sample_offsets[2*k+1];
+			minimap.sample_offsets[2*k+0] = rx;
+			minimap.sample_offsets[2*k+1] = ry;
+			if(!MiniMapEvaluateSampleOffsets(&jj, &kk, &valk))
+				valk = -1;
+			minimap.sample_offsets[2*k+0] = sx;
+			minimap.sample_offsets[2*k+1] = sy;
+
+			if(valj > valk)
+			{
+				if(valj > val)
+				{
+					/* valj is the greatest */
+					minimap.sample_offsets[2*j+0] = rx;
+					minimap.sample_offsets[2*j+1] = ry;
+					i = -1;
+				}
+				else
+				{
+					/* valj is the greater and it is useless - forget it */
+				}
+			}
+			else
+			{
+				if(valk > val)
+				{
+					/* valk is the greatest */
+					minimap.sample_offsets[2*k+0] = rx;
+					minimap.sample_offsets[2*k+1] = ry;
+					i = -1;
+				}
+				else
+				{
+					/* valk is the greater and it is useless - forget it */
+				}
+			}
+		}
+		else
+			break;
+	}
+}
+
+void MergeRelativePath(char *out, const char *absolute, const char *relative)
+{
+	const char *endpos = absolute + strlen(absolute);
+	while(endpos != absolute && (endpos[-1] == '/' || endpos[-1] == '\\'))
+		--endpos;
+	while(relative[0] == '.' && relative[1] == '.' && (relative[2] == '/' || relative[2] == '\\'))
+	{
+		relative += 3;
+		while(endpos != absolute)
+		{
+			--endpos;
+			if(*endpos == '/' || *endpos == '\\')
+				break;
+		}
+		while(endpos != absolute && (endpos[-1] == '/' || endpos[-1] == '\\'))
+			--endpos;
+	}
+	memcpy(out, absolute, endpos - absolute);
+	out[endpos - absolute] = '/';
+	strcpy(out + (endpos - absolute + 1), relative);
+}
+
 int MiniMapBSPMain( int argc, char **argv )
 {
 	char minimapFilename[1024];
+	char basename[1024];
+	char path[1024];
+	char relativeMinimapFilename[1024];
+	qboolean autolevel;
 	float minimapSharpen;
-	byte *data3b, *p;
+	float border;
+	byte *data4b, *p;
 	float *q;
 	int x, y;
 	int i;
+	miniMapMode_t mode;
+	vec3_t mins, maxs;
+	qboolean keepaspect;
 
 	/* arg checking */
 	if( argc < 2 )
 	{
-		Sys_Printf( "Usage: q3map [-v] -minimap [-size n] [-sharpen n] [-samples f] [-o filename.tga] [-minmax Xmin Ymin Zmin Xmax Ymax Zmax] <mapname>\n" );
+		Sys_Printf( "Usage: q3map [-v] -minimap [-size n] [-sharpen f] [-samples n | -random n] [-o filename.tga] [-minmax Xmin Ymin Zmin Xmax Ymax Zmax] <mapname>\n" );
 		return 0;
 	}
 
@@ -335,16 +517,27 @@ int MiniMapBSPMain( int argc, char **argv )
 	StripExtension( source );
 	DefaultExtension( source, ".bsp" );
 	Sys_Printf( "Loading %s\n", source );
+	BeginMapShaderFile( source );
+	LoadShaderInfo();
 	LoadBSPFile( source );
 
 	minimap.model = &bspModels[0];
-	MiniMapMakeMinsMaxs();
+	VectorCopy(minimap.model->mins, mins);
+	VectorCopy(minimap.model->maxs, maxs);
 
 	*minimapFilename = 0;
-	minimapSharpen = 1;
-	minimap.width = minimap.height = 512;
+	minimapSharpen = game->miniMapSharpen;
+	minimap.width = minimap.height = game->miniMapSize;
+	border = game->miniMapBorder;
+	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++ )
@@ -366,7 +559,35 @@ int MiniMapBSPMain( int argc, char **argv )
 			minimap.samples = atoi(argv[i + 1]);
 			i++;
 			Sys_Printf( "Samples set to %i\n", minimap.samples );
-			/* TODO generate a static subsampling pattern */
+			if(minimap.sample_offsets)
+				free(minimap.sample_offsets);
+			minimap.sample_offsets = malloc(2 * sizeof(*minimap.sample_offsets) * minimap.samples);
+			MiniMapMakeSampleOffsets();
+ 		}
+		else if( !strcmp( argv[ i ],  "-random" ) )
+ 		{
+			minimap.samples = atoi(argv[i + 1]);
+			i++;
+			Sys_Printf( "Random samples set to %i\n", minimap.samples );
+			if(minimap.sample_offsets)
+				free(minimap.sample_offsets);
+			minimap.sample_offsets = NULL;
+ 		}
+		else if( !strcmp( argv[ i ],  "-border" ) )
+ 		{
+			border = atof(argv[i + 1]);
+			i++;
+			Sys_Printf( "Border set to %f\n", border );
+ 		}
+		else if( !strcmp( argv[ i ],  "-keepaspect" ) )
+ 		{
+			keepaspect = qtrue;
+			Sys_Printf( "Keeping aspect ratio by letterboxing\n", border );
+ 		}
+		else if( !strcmp( argv[ i ],  "-nokeepaspect" ) )
+ 		{
+			keepaspect = qfalse;
+			Sys_Printf( "Not keeping aspect ratio\n", border );
  		}
 		else if( !strcmp( argv[ i ],  "-o" ) )
  		{
@@ -376,20 +597,72 @@ int MiniMapBSPMain( int argc, char **argv )
  		}
 		else if( !strcmp( argv[ i ],  "-minmax" ) && i < (argc - 7) )
  		{
-			minimap.mins[0] = atof(argv[i + 1]);
-			minimap.mins[1] = atof(argv[i + 2]);
-			minimap.mins[2] = atof(argv[i + 3]);
-			minimap.size[0] = atof(argv[i + 4]) - minimap.mins[0];
-			minimap.size[1] = atof(argv[i + 5]) - minimap.mins[1];
-			minimap.size[2] = atof(argv[i + 6]) - minimap.mins[2];
+			mins[0] = atof(argv[i + 1]);
+			mins[1] = atof(argv[i + 2]);
+			mins[2] = atof(argv[i + 3]);
+			maxs[0] = atof(argv[i + 4]);
+			maxs[1] = atof(argv[i + 5]);
+			maxs[2] = atof(argv[i + 6]);
 			i += 6;
 			Sys_Printf( "Map mins/maxs overridden\n" );
  		}
+		else if( !strcmp( argv[ i ],  "-gray" ) )
+ 		{
+			mode = MINIMAP_MODE_GRAY;
+			Sys_Printf( "Writing as white-on-black image\n" );
+ 		}
+		else if( !strcmp( argv[ i ],  "-black" ) )
+ 		{
+			mode = MINIMAP_MODE_BLACK;
+			Sys_Printf( "Writing as black alpha image\n" );
+ 		}
+		else if( !strcmp( argv[ i ],  "-white" ) )
+ 		{
+			mode = MINIMAP_MODE_WHITE;
+			Sys_Printf( "Writing as white alpha image\n" );
+ 		}
+		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 );
+ 		}
 	}
 
-	strcpy( minimapFilename, ExpandArg( argv[ argc - 1 ] ) );
-	StripExtension( minimapFilename );
-	DefaultExtension( minimapFilename, ".tga" );
+	MiniMapMakeMinsMaxs(mins, maxs, border, keepaspect);
+
+	if(!*minimapFilename)
+	{
+		ExtractFileBase(source, basename);
+		ExtractFilePath(source, path);
+		sprintf(relativeMinimapFilename, game->miniMapNameFormat, basename);
+		MergeRelativePath(minimapFilename, path, relativeMinimapFilename);
+		Sys_Printf("Output file name automatically set to %s\n", minimapFilename);
+	}
+	ExtractFilePath(minimapFilename, path);
+	Q_mkdir(path);
 
 	if(minimapSharpen >= 0)
 	{
@@ -398,31 +671,81 @@ int MiniMapBSPMain( int argc, char **argv )
 	}
 
 	minimap.data1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
-	data3b = safe_malloc(minimap.width * minimap.height * 3);
+	data4b = safe_malloc(minimap.width * minimap.height * 4);
 	if(minimapSharpen >= 0)
 		minimap.sharpendata1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
 
-	SetupBrushes();
+	MiniMapSetupBrushes();
 
 	if(minimap.samples <= 1)
 	{
-		Sys_Printf( "\n--- MiniMapNoSubsampling (%d) ---\n", minimap.height );
-		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSubsampling);
+		Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height );
+		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSupersampling);
 	}
 	else
 	{
 		if(minimap.sample_offsets)
 		{
-			Sys_Printf( "\n--- MiniMapSubsampled (%d) ---\n", minimap.height );
-			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSubsampled);
+			Sys_Printf( "\n--- MiniMapSupersampled (%d) ---\n", minimap.height );
+			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSupersampled);
 		}
 		else
 		{
-			Sys_Printf( "\n--- MiniMapRandomlySubsampled (%d) ---\n", minimap.height );
-			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapRandomlySubsampled);
+			Sys_Printf( "\n--- MiniMapRandomlySupersampled (%d) ---\n", minimap.height );
+			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapRandomlySupersampled);
 		}
 	}
 
+	if(minimap.boost != 1.0)
+	{
+		Sys_Printf( "\n--- MiniMapContrastBoost (%d) ---\n", minimap.height );
+		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!
+		q = minimap.data1f;
+		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;
+			}
+		if(ma > mi)
+		{
+			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.brightness );
+			Sys_Printf( "Auto level: Contrast changed to %f\n", minimap.contrast );
+		}
+		else
+			Sys_Printf( "Auto level: failed because all pixels are the same value\n" );
+	}
+
+	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 );
@@ -435,22 +758,61 @@ int MiniMapBSPMain( int argc, char **argv )
 	}
 
 	Sys_Printf( "\nConverting...");
-	p = data3b;
-	for(y = 0; y < minimap.height; ++y)
-		for(x = 0; x < minimap.width; ++x)
-		{
-			byte b;
-			float v = *q++;
-			if(v < 0) v = 0;
-			if(v > 255.0/256.0) v = 255.0/256.0;
-			b = v * 256;
-			*p++ = b;
-			*p++ = b;
-			*p++ = b;
-		}
 
-	Sys_Printf( " writing to %s...", minimapFilename );
-	WriteTGA24(minimapFilename, data3b, minimap.width, minimap.height, qfalse);
+	switch(mode)
+	{
+		case MINIMAP_MODE_GRAY:
+			p = data4b;
+			for(y = 0; y < minimap.height; ++y)
+				for(x = 0; x < minimap.width; ++x)
+				{
+					byte b;
+					float v = *q++;
+					if(v < 0) v = 0;
+					if(v > 255.0/256.0) v = 255.0/256.0;
+					b = v * 256;
+					*p++ = b;
+				}
+			Sys_Printf( " writing to %s...", minimapFilename );
+			WriteTGAGray(minimapFilename, data4b, minimap.width, minimap.height);
+			break;
+		case MINIMAP_MODE_BLACK:
+			p = data4b;
+			for(y = 0; y < minimap.height; ++y)
+				for(x = 0; x < minimap.width; ++x)
+				{
+					byte b;
+					float v = *q++;
+					if(v < 0) v = 0;
+					if(v > 255.0/256.0) v = 255.0/256.0;
+					b = v * 256;
+					*p++ = 0;
+					*p++ = 0;
+					*p++ = 0;
+					*p++ = b;
+				}
+			Sys_Printf( " writing to %s...", minimapFilename );
+			WriteTGA(minimapFilename, data4b, minimap.width, minimap.height);
+			break;
+		case MINIMAP_MODE_WHITE:
+			p = data4b;
+			for(y = 0; y < minimap.height; ++y)
+				for(x = 0; x < minimap.width; ++x)
+				{
+					byte b;
+					float v = *q++;
+					if(v < 0) v = 0;
+					if(v > 255.0/256.0) v = 255.0/256.0;
+					b = v * 256;
+					*p++ = 255;
+					*p++ = 255;
+					*p++ = 255;
+					*p++ = b;
+				}
+			Sys_Printf( " writing to %s...", minimapFilename );
+			WriteTGA(minimapFilename, data4b, minimap.width, minimap.height);
+			break;
+	}
 
 	Sys_Printf( " done.\n" );
 
@@ -651,8 +1013,8 @@ int AnalyzeBSP( int argc, char **argv )
 		lump = (byte*) header + offset;
 		lumpInt = LittleLong( (int) *((int*) lump) );
 		lumpFloat = LittleFloat( (float) *((float*) lump) );
-		memcpy( lumpString, (char*) lump, (length < 1024 ? length : 1024) );
-		lumpString[ 1024 ] = '\0';
+		memcpy( lumpString, (char*) lump, ((size_t)length < sizeof(lumpString) ? (size_t)length : sizeof(lumpString)-1) );
+		lumpString[ sizeof(lumpString)-1 ] = '\0';
 		
 		/* print basic lump info */
 		Sys_Printf( "Lump:          %d\n", i );
@@ -851,29 +1213,45 @@ int ScaleBSPMain( int argc, char **argv )
 	int uniform, axis;
 	qboolean texscale;
 	float *old_xyzst = NULL;
+	float spawn_ref = 0;
 	
 	
 	/* arg checking */
 	if( argc < 3 )
 	{
-		Sys_Printf( "Usage: q3map [-v] -scale [-tex] <value> <mapname>\n" );
+		Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
 		return 0;
 	}
 	
+	texscale = qfalse;
+	for(i = 1; i < argc-2; ++i)
+	{
+		if(!strcmp(argv[i], "-tex"))
+		{
+			texscale = qtrue;
+		}
+		else if(!strcmp(argv[i], "-spawn_ref"))
+		{
+			spawn_ref = atof(argv[i+1]);
+			++i;
+		}
+		else
+			break;
+	}
+	
 	/* get scale */
-	scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
-	if(argc >= 4)
+	// if(argc-2 >= i) // always true
+		scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
+	if(argc-3 >= i)
 		scale[1] = scale[0] = atof( argv[ argc - 3 ] );
-	if(argc >= 5)
+	if(argc-4 >= i)
 		scale[0] = atof( argv[ argc - 4 ] );
 
-	texscale = !strcmp(argv[1], "-tex");
-	
 	uniform = ((scale[0] == scale[1]) && (scale[1] == scale[2]));
 
 	if( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f )
 	{
-		Sys_Printf( "Usage: q3map [-v] -scale [-tex] <value> <mapname>\n" );
+		Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
 		Sys_Printf( "Non-zero scale value required.\n" );
 		return 0;
 	}
@@ -899,9 +1277,13 @@ int ScaleBSPMain( int argc, char **argv )
 		GetVectorForKey( &entities[ i ], "origin", vec );
 		if( (vec[ 0 ] || vec[ 1 ] || vec[ 2 ]) )
 		{
+			if(!strncmp(ValueForKey(&entities[i], "classname"), "info_player_", 12))
+				vec[2] += spawn_ref;
 			vec[0] *= scale[0];
 			vec[1] *= scale[1];
 			vec[2] *= scale[2];
+			if(!strncmp(ValueForKey(&entities[i], "classname"), "info_player_", 12))
+				vec[2] -= spawn_ref;
 			sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
 			SetKeyValue( &entities[ i ], "origin", str );
 		}
@@ -1072,6 +1454,101 @@ int ScaleBSPMain( int argc, char **argv )
 }
 
 
+/*
+PseudoCompileBSP()
+a stripped down ProcessModels
+*/
+void PseudoCompileBSP(qboolean need_tree)
+{
+	int models;
+	char modelValue[10];
+	entity_t *entity;
+	face_t *faces;
+	tree_t *tree;
+	node_t *node;
+	brush_t *brush;
+	side_t *side;
+	int i;
+
+        SetDrawSurfacesBuffer();
+	mapDrawSurfs = safe_malloc( sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
+	memset( mapDrawSurfs, 0, sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
+	numMapDrawSurfs = 0;
+
+	BeginBSPFile();
+	models = 1;
+	for( mapEntityNum = 0; mapEntityNum < numEntities; mapEntityNum++ )
+	{
+		/* get entity */
+		entity = &entities[ mapEntityNum ];
+		if( entity->brushes == NULL && entity->patches == NULL )
+			continue;
+
+		if(mapEntityNum != 0)
+		{
+			sprintf( modelValue, "*%d", models++);
+			SetKeyValue(entity, "model", modelValue);
+		}
+		
+		/* process the model */
+		Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
+		BeginModel();
+
+		entity->firstDrawSurf = numMapDrawSurfs;
+
+		ClearMetaTriangles();
+		PatchMapDrawSurfs(entity);
+
+		if(mapEntityNum == 0 && need_tree)
+		{
+			faces = MakeStructuralBSPFaceList(entities[0].brushes);
+			tree = FaceBSP(faces);
+			node = tree->headnode;
+		}
+		else
+		{
+			node = AllocNode();
+			node->planenum = PLANENUM_LEAF;
+			tree = AllocTree();
+			tree->headnode = node;
+		}
+
+		/* a minimized ClipSidesIntoTree */
+		for( brush = entity->brushes; brush; brush = brush->next )
+		{
+			/* walk the brush sides */
+			for( i = 0; i < brush->numsides; i++ )
+			{
+				/* get side */
+				side = &brush->sides[ i ];
+				if( side->winding == NULL )
+					continue;
+				/* shader? */
+				if( side->shaderInfo == NULL )
+					continue;
+				/* save this winding as a visible surface */
+				DrawSurfaceForSide(entity, brush, side, side->winding);
+			}
+		}
+
+		if(meta)
+		{
+			ClassifyEntitySurfaces(entity);
+			MakeEntityDecals(entity);
+			MakeEntityMetaTriangles(entity);
+			SmoothMetaTriangles();
+			MergeMetaTriangles();
+		}
+		FilterDrawsurfsIntoTree(entity, tree);
+
+		FilterStructuralBrushesIntoTree(entity, tree);
+		FilterDetailBrushesIntoTree(entity, tree);
+
+		EmitBrushes(entity->brushes, &entity->firstBrush, &entity->numBrushes );
+		EndModel(entity, node);
+	}
+	EndBSPFile(qfalse);
+}
 
 /*
 ConvertBSPMain()
@@ -1083,16 +1560,21 @@ int ConvertBSPMain( int argc, char **argv )
 	int		i;
 	int		(*convertFunc)( char * );
 	game_t	*convertGame;
+	char		ext[1024];
+	qboolean	map_allowed, force_bsp, force_map;
 	
 	
 	/* set default */
 	convertFunc = ConvertBSPToASE;
 	convertGame = NULL;
+	map_allowed = qfalse;
+	force_bsp = qfalse;
+	force_map = qfalse;
 	
 	/* arg checking */
 	if( argc < 1 )
 	{
-		Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
+		Sys_Printf( "Usage: q3map -convert -format <ase|obj|map_bp|map> [-shadesasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] <mapname>\n" );
 		return 0;
 	}
 	
@@ -1104,12 +1586,29 @@ int ConvertBSPMain( int argc, char **argv )
  		{
 			i++;
 			if( !Q_stricmp( argv[ i ], "ase" ) )
+			{
 				convertFunc = ConvertBSPToASE;
+				map_allowed = qfalse;
+			}
+			else if( !Q_stricmp( argv[ i ], "obj" ) )
+			{
+				convertFunc = ConvertBSPToOBJ;
+				map_allowed = qfalse;
+			}
+			else if( !Q_stricmp( argv[ i ], "map_bp" ) )
+			{
+				convertFunc = ConvertBSPToMap_BP;
+				map_allowed = qtrue;
+			}
 			else if( !Q_stricmp( argv[ i ], "map" ) )
+			{
 				convertFunc = ConvertBSPToMap;
+				map_allowed = qtrue;
+			}
 			else
 			{
 				convertGame = GetGame( argv[ i ] );
+				map_allowed = qfalse;
 				if( convertGame == NULL )
 					Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
 			}
@@ -1128,24 +1627,53 @@ int ConvertBSPMain( int argc, char **argv )
  		}
 		else if( !strcmp( argv[ i ],  "-shadersasbitmap" ) )
 			shadersAsBitmap = qtrue;
+		else if( !strcmp( argv[ i ],  "-lightmapsastexcoord" ) )
+			lightmapsAsTexcoord = qtrue;
+		else if( !strcmp( argv[ i ],  "-deluxemapsastexcoord" ) )
+		{
+			lightmapsAsTexcoord = qtrue;
+			deluxemap = qtrue;
+		}
+		else if( !strcmp( argv[ i ],  "-readbsp" ) )
+			force_bsp = qtrue;
+		else if( !strcmp( argv[ i ],  "-readmap" ) )
+			force_map = qtrue;
+		else if( !strcmp( argv[ i ],  "-meta" ) )
+			meta = qtrue;
+		else if( !strcmp( argv[ i ],  "-patchmeta" ) )
+		{
+			meta = qtrue;
+			patchMeta = qtrue;
+		}
 	}
-	
-	/* clean up map name */
-	strcpy( source, ExpandArg( argv[ i ] ) );
-	StripExtension( source );
-	DefaultExtension( source, ".bsp" );
-	
+
 	LoadShaderInfo();
 	
-	Sys_Printf( "Loading %s\n", source );
-	
-	/* ydnar: load surface file */
-	//%	LoadSurfaceExtraFile( source );
-	
-	LoadBSPFile( source );
-	
-	/* parse bsp entities */
-	ParseEntities();
+	/* clean up map name */
+	strcpy(source, ExpandArg(argv[i]));
+	ExtractFileExtension(source, ext);
+
+	if(!map_allowed && !force_map)
+		force_bsp = qtrue;
+
+	if(force_map || (!force_bsp && !Q_stricmp(ext, "map") && map_allowed))
+	{
+		if(!map_allowed)
+			Sys_Printf("WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n");
+		StripExtension(source);
+		DefaultExtension(source, ".map");
+		Sys_Printf("Loading %s\n", source);
+		LoadMapFile(source, qfalse, convertGame == NULL);
+		PseudoCompileBSP(convertGame != NULL);
+	}
+	else
+	{
+		StripExtension(source);
+		DefaultExtension(source, ".bsp");
+		Sys_Printf("Loading %s\n", source);
+		LoadBSPFile(source);
+		ParseEntities();
+	}
 	
 	/* bsp format convert? */
 	if( convertGame != NULL )
@@ -1241,7 +1769,7 @@ int main( int argc, char **argv )
 			argv[ i ] = NULL;
 		}
 	}
-	
+
 	/* init model library */
 	PicoInit();
 	PicoSetMallocFunc( safe_malloc );