X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmain.c;h=ab89ea9bfbd3169e5dc60063aeb51f07b67e1f86;hb=d46ef935db7cc2644de37f9dbdf388a2cd73f2ee;hp=b9fb7d89ee839bd3bd362bf36b243fcf46133d47;hpb=4eeb89d4b2c37bba2393caa63508b3ffe03e65c6;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index b9fb7d89..ab89ea9b 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -64,6 +64,628 @@ 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;
+	int width;
+	int height;
+	int samples;
+	float *sample_offsets;
+	float sharpen_boxmult;
+	float sharpen_centermult;
+	float *data1f;
+	float *sharpendata1f;
+	vec3_t mins, size;
+}
+minimap_t;
+static minimap_t minimap;
+
+qboolean BrushIntersectionWithLine(bspBrush_t *brush, vec3_t start, vec3_t dir, float *t_in, float *t_out)
+{
+	int i;
+	qboolean in = qfalse, out = qfalse;
+	bspBrushSide_t *sides = &bspBrushSides[brush->firstSide];
+
+	for(i = 0; i < brush->numSides; ++i)
+	{
+		bspPlane_t *p = &bspPlanes[sides[i].planeNum];
+		float sn = DotProduct(start, p->normal);
+		float dn = DotProduct(dir, p->normal);
+		if(dn == 0)
+		{
+			if(sn > p->dist)
+				return qfalse; // outside!
+		}
+		else
+		{
+			float t = (p->dist - sn) / dn;
+			if(dn < 0)
+			{
+				if(!in || t > *t_in)
+				{
+					*t_in = t;
+					in = qtrue;
+					// as t_in can only increase, and t_out can only decrease, early out
+					if(out && *t_in >= *t_out)
+						return qfalse;
+				}
+			}
+			else
+			{
+				if(!out || t < *t_out)
+				{
+					*t_out = t;
+					out = qtrue;
+					// as t_in can only increase, and t_out can only decrease, early out
+					if(in && *t_in >= *t_out)
+						return qfalse;
+				}
+			}
+		}
+	}
+	return in && out;
+}
+
+static float MiniMapSample(float x, float y)
+{
+	vec3_t org, dir;
+	int i, bi;
+	float t0, t1;
+	float samp;
+	bspBrush_t *b;
+	bspBrushSide_t *s;
+	int cnt;
+
+	org[0] = x;
+	org[1] = y;
+	org[2] = 0;
+	dir[0] = 0;
+	dir[1] = 0;
+	dir[2] = 1;
+
+	cnt = 0;
+	samp = 0;
+	for(i = 0; i < minimap.model->numBSPBrushes; ++i)
+	{
+		bi = minimap.model->firstBSPBrush + i;
+		if(opaqueBrushes[bi >> 3] & (1 << (bi & 7)))
+		{
+			b = &bspBrushes[bi];
+
+			// sort out mins/maxs of the brush
+			s = &bspBrushSides[b->firstSide];
+			if(x < -bspPlanes[s[0].planeNum].dist)
+				continue;
+			if(x > +bspPlanes[s[1].planeNum].dist)
+				continue;
+			if(y < -bspPlanes[s[2].planeNum].dist)
+				continue;
+			if(y > +bspPlanes[s[3].planeNum].dist)
+				continue;
+
+			if(BrushIntersectionWithLine(b, org, dir, &t0, &t1))
+			{
+				samp += t1 - t0;
+				++cnt;
+			}
+		}
+	}
+
+	return samp;
+}
+
+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)
+	{
+		float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
+		float val = 0;
+
+		for(i = 0; i < minimap.samples; ++i)
+		{
+			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;
+		}
+		val /= minimap.samples * minimap.size[2];
+		*p++ = val;
+	}
+}
+
+static void MiniMapSupersampled(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;
+
+	for(x = 0; x < minimap.width; ++x)
+	{
+		float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width);
+		float val = 0;
+
+		for(i = 0; i < minimap.samples; ++i)
+		{
+			float thisval = MiniMapSample(
+				xmin + minimap.sample_offsets[2*i+0] * dx,
+				ymin + minimap.sample_offsets[2*i+1] * dy
+			);
+			val += thisval;
+		}
+		val /= minimap.samples * minimap.size[2];
+		*p++ = val;
+	}
+}
+
+static void MiniMapNoSupersampling(int y)
+{
+	int x;
+	float *p = &minimap.data1f[y * minimap.width];
+	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 + 0.5) / (float) minimap.width);
+		*p++ = MiniMapSample(xmin, ymin) / minimap.size[2];
+	}
+}
+
+static void MiniMapSharpen(int y)
+{
+	int x;
+	qboolean up = (y > 0);
+	qboolean down = (y < minimap.height - 1);
+	float *p = &minimap.data1f[y * minimap.width];
+	float *q = &minimap.sharpendata1f[y * minimap.width];
+
+	for(x = 0; x < minimap.width; ++x)
+	{
+		qboolean left = (x > 0);
+		qboolean right = (x < minimap.width - 1);
+		float val = p[0] * minimap.sharpen_centermult;
+
+		if(left && up)
+			val += p[-1 -minimap.width] * minimap.sharpen_boxmult;
+		if(left && down)
+			val += p[-1 +minimap.width] * minimap.sharpen_boxmult;
+		if(right && up)
+			val += p[+1 -minimap.width] * minimap.sharpen_boxmult;
+		if(right && down)
+			val += p[+1 +minimap.width] * minimap.sharpen_boxmult;
+			
+		if(left)
+			val += p[-1] * minimap.sharpen_boxmult;
+		if(right)
+			val += p[+1] * minimap.sharpen_boxmult;
+		if(up)
+			val += p[-minimap.width] * minimap.sharpen_boxmult;
+		if(down)
+			val += p[+minimap.width] * minimap.sharpen_boxmult;
+
+		++p;
+		*q++ = val;
+	}
+}
+
+void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in, float border)
+{
+	vec3_t mins, maxs, extend;
+	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
+	{
+		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, border / (1 - 2 * border), extend);
+
+	VectorSubtract(mins, extend, mins);
+	VectorAdd(maxs, extend, maxs);
+
+	VectorCopy(mins, minimap.mins);
+	VectorSubtract(maxs, mins, minimap.size);
+
+	// line compatible to nexuiz mapinfo
+	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 )
+{
+	int				i, j, b, compileFlags;
+	bspBrush_t		*brush;
+	bspBrushSide_t	*side;
+	bspShader_t		*shader;
+	shaderInfo_t	*si;
+	
+	
+	/* note it */
+	Sys_FPrintf( SYS_VRB, "--- MiniMapSetupBrushes ---\n" );
+	
+	/* allocate */
+	if( opaqueBrushes == NULL )
+		opaqueBrushes = safe_malloc( numBSPBrushes / 8 + 1 );
+	
+	/* clear */
+	memset( opaqueBrushes, 0, numBSPBrushes / 8 + 1 );
+	numOpaqueBrushes = 0;
+	
+	/* walk the list of worldspawn brushes */
+	for( i = 0; i < minimap.model->numBSPBrushes; i++ )
+	{
+		/* get brush */
+		b = minimap.model->firstBSPBrush + i;
+		brush = &bspBrushes[ b ];
+		
+#if 0
+		/* check all sides */
+		compileFlags = 0;
+		for( j = 0; j < brush->numSides; j++ )
+		{
+			/* do bsp shader calculations */
+			side = &bspBrushSides[ brush->firstSide + j ];
+			shader = &bspShaders[ side->shaderNum ];
+			
+			/* get shader info */
+			si = ShaderInfoForShader( shader->shader );
+			if( si == NULL )
+				continue;
+			
+			/* or together compile flags */
+			compileFlags |= si->compileFlags;
+		}
+#else
+		shader = &bspShaders[ brush->shaderNum ];
+		si = ShaderInfoForShader( shader->shader );
+		if( si == NULL )
+			compileFlags = 0;
+		else
+			compileFlags = si->compileFlags;
+#endif
+		
+		/* determine if this brush is solid */
+		if( (compileFlags & (C_SOLID | C_SKY)) == C_SOLID )
+		{
+			opaqueBrushes[ b >> 3 ] |= (1 << (b & 7));
+			numOpaqueBrushes++;
+			maxOpaqueBrush = i;
+		}
+	}
+	
+	/* emit some statistics */
+	Sys_FPrintf( SYS_VRB, "%9d solid brushes\n", numOpaqueBrushes );
+}
+
+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, dx, dy, 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;
+	}
+}
+
+int MiniMapBSPMain( int argc, char **argv )
+{
+	char minimapFilename[1024];
+	char basename[1024];
+	char path[1024];
+	char parentpath[1024];
+	float minimapSharpen;
+	float border;
+	byte *data3b, *p;
+	float *q;
+	int x, y;
+	int i;
+	vec3_t mins, maxs;
+
+	/* arg checking */
+	if( argc < 2 )
+	{
+		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;
+	}
+
+	/* load the BSP first */
+	strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
+	StripExtension( source );
+	DefaultExtension( source, ".bsp" );
+	Sys_Printf( "Loading %s\n", source );
+	BeginMapShaderFile( source );
+	LoadShaderInfo();
+	LoadBSPFile( source );
+
+	minimap.model = &bspModels[0];
+	VectorCopy(minimap.model->mins, mins);
+	VectorCopy(minimap.model->maxs, maxs);
+	*minimapFilename = 0;
+	minimapSharpen = 1;
+	minimap.width = minimap.height = 512;
+	minimap.samples = 1;
+	minimap.sample_offsets = NULL;
+	border = 1/66.0; /* good default for Nexuiz */
+
+	/* process arguments */
+	for( i = 1; i < (argc - 1); i++ )
+	{
+		if( !strcmp( argv[ i ],  "-size" ) )
+ 		{
+			minimap.width = minimap.height = atoi(argv[i + 1]);
+			i++;
+			Sys_Printf( "Image size set to %i\n", minimap.width );
+ 		}
+		else if( !strcmp( argv[ i ],  "-sharpen" ) )
+ 		{
+			minimapSharpen = atof(argv[i + 1]);
+			i++;
+			Sys_Printf( "Sharpening coefficient set to %f\n", minimapSharpen );
+ 		}
+		else if( !strcmp( argv[ i ],  "-samples" ) )
+ 		{
+			minimap.samples = atoi(argv[i + 1]);
+			i++;
+			Sys_Printf( "Samples set to %i\n", minimap.samples );
+			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 ],  "-o" ) )
+ 		{
+			strcpy(minimapFilename, argv[i + 1]);
+			i++;
+			Sys_Printf( "Output file name set to %s\n", minimapFilename );
+ 		}
+		else if( !strcmp( argv[ i ],  "-minmax" ) && i < (argc - 7) )
+ 		{
+			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" );
+ 		}
+	}
+
+	MiniMapMakeMinsMaxs(mins, maxs, border);
+
+	if(!*minimapFilename)
+	{
+		ExtractFileBase(source, basename);
+		ExtractFilePath(source, path);
+		if(*path)
+			path[strlen(path)-1] = 0;
+		ExtractFilePath(path, parentpath);
+		sprintf(minimapFilename, "%sgfx", parentpath);
+		Q_mkdir(minimapFilename);
+		sprintf(minimapFilename, "%sgfx/%s_mini.tga", parentpath, basename);
+		Sys_Printf("Output file name automatically set to %s\n", minimapFilename);
+	}
+
+	if(minimapSharpen >= 0)
+	{
+		minimap.sharpen_centermult = 8 * minimapSharpen + 1;
+		minimap.sharpen_boxmult    =    -minimapSharpen;
+	}
+
+	minimap.data1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
+	data3b = safe_malloc(minimap.width * minimap.height * 3);
+	if(minimapSharpen >= 0)
+		minimap.sharpendata1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f));
+
+	MiniMapSetupBrushes();
+
+	if(minimap.samples <= 1)
+	{
+		Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height );
+		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSupersampling);
+	}
+	else
+	{
+		if(minimap.sample_offsets)
+		{
+			Sys_Printf( "\n--- MiniMapSupersampled (%d) ---\n", minimap.height );
+			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSupersampled);
+		}
+		else
+		{
+			Sys_Printf( "\n--- MiniMapRandomlySupersampled (%d) ---\n", minimap.height );
+			RunThreadsOnIndividual(minimap.height, qtrue, MiniMapRandomlySupersampled);
+		}
+	}
+
+	if(minimap.sharpendata1f)
+	{
+		Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height );
+		RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSharpen);
+		q = minimap.sharpendata1f;
+	}
+	else
+	{
+		q = minimap.data1f;
+	}
+
+	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);
+
+	Sys_Printf( " done.\n" );
+
+	/* return to sender */
+	return 0;
+}
+
+
+
+
+
 /*
 MD4BlockChecksum()
 calculates an md4 checksum for a block of data
@@ -74,8 +696,6 @@ static int MD4BlockChecksum( void *buffer, int length )
 	return Com_BlockChecksum(buffer, length);
 }
 
-
-
 /*
 FixAAS()
 resets an aas checksum to match the given BSP
@@ -371,6 +991,74 @@ int BSPInfo( int count, char **fileNames )
 }
 
 
+static void ExtrapolateTexcoords(const float *axyz, const float *ast, const float *bxyz, const float *bst, const float *cxyz, const float *cst, const float *axyz_new, float *ast_out, const float *bxyz_new, float *bst_out, const float *cxyz_new, float *cst_out)
+{
+	vec4_t scoeffs, tcoeffs;
+	float md;
+	m4x4_t solvematrix;
+
+	vec3_t norm;
+	vec3_t dab, dac;
+	VectorSubtract(bxyz, axyz, dab);
+	VectorSubtract(cxyz, axyz, dac);
+	CrossProduct(dab, dac, norm);
+	
+	// assume:
+	//   s = f(x, y, z)
+	//   s(v + norm) = s(v) when n ortho xyz
+	
+	// s(v) = DotProduct(v, scoeffs) + scoeffs[3]
+
+	// solve:
+	//   scoeffs * (axyz, 1) == ast[0]
+	//   scoeffs * (bxyz, 1) == bst[0]
+	//   scoeffs * (cxyz, 1) == cst[0]
+	//   scoeffs * (norm, 0) == 0
+	// scoeffs * [axyz, 1 | bxyz, 1 | cxyz, 1 | norm, 0] = [ast[0], bst[0], cst[0], 0]
+	solvematrix[0] = axyz[0];
+	solvematrix[4] = axyz[1];
+	solvematrix[8] = axyz[2];
+	solvematrix[12] = 1;
+	solvematrix[1] = bxyz[0];
+	solvematrix[5] = bxyz[1];
+	solvematrix[9] = bxyz[2];
+	solvematrix[13] = 1;
+	solvematrix[2] = cxyz[0];
+	solvematrix[6] = cxyz[1];
+	solvematrix[10] = cxyz[2];
+	solvematrix[14] = 1;
+	solvematrix[3] = norm[0];
+	solvematrix[7] = norm[1];
+	solvematrix[11] = norm[2];
+	solvematrix[15] = 0;
+
+	md = m4_det(solvematrix);
+	if(md*md < 1e-10)
+	{
+		Sys_Printf("Cannot invert some matrix, some texcoords aren't extrapolated!");
+		return;
+	}
+
+	m4x4_invert(solvematrix);
+
+	scoeffs[0] = ast[0];
+	scoeffs[1] = bst[0];
+	scoeffs[2] = cst[0];
+	scoeffs[3] = 0;
+	m4x4_transform_vec4(solvematrix, scoeffs);
+	tcoeffs[0] = ast[1];
+	tcoeffs[1] = bst[1];
+	tcoeffs[2] = cst[1];
+	tcoeffs[3] = 0;
+	m4x4_transform_vec4(solvematrix, tcoeffs);
+
+	ast_out[0] = scoeffs[0] * axyz_new[0] + scoeffs[1] * axyz_new[1] + scoeffs[2] * axyz_new[2] + scoeffs[3];
+	ast_out[1] = tcoeffs[0] * axyz_new[0] + tcoeffs[1] * axyz_new[1] + tcoeffs[2] * axyz_new[2] + tcoeffs[3];
+	bst_out[0] = scoeffs[0] * bxyz_new[0] + scoeffs[1] * bxyz_new[1] + scoeffs[2] * bxyz_new[2] + scoeffs[3];
+	bst_out[1] = tcoeffs[0] * bxyz_new[0] + tcoeffs[1] * bxyz_new[1] + tcoeffs[2] * bxyz_new[2] + tcoeffs[3];
+	cst_out[0] = scoeffs[0] * cxyz_new[0] + scoeffs[1] * cxyz_new[1] + scoeffs[2] * cxyz_new[2] + scoeffs[3];
+	cst_out[1] = tcoeffs[0] * cxyz_new[0] + tcoeffs[1] * cxyz_new[1] + tcoeffs[2] * cxyz_new[2] + tcoeffs[3];
+}
 
 /*
 ScaleBSPMain()
@@ -379,24 +1067,37 @@ amaze and confuse your enemies with wierd scaled maps!
 
 int ScaleBSPMain( int argc, char **argv )
 {
-	int			i;
-	float		f, scale;
+	int			i, j;
+	float		f, a;
+	vec3_t scale;
 	vec3_t		vec;
 	char		str[ 1024 ];
+	int uniform, axis;
+	qboolean texscale;
+	float *old_xyzst = NULL;
 	
 	
 	/* arg checking */
-	if( argc < 2 )
+	if( argc < 3 )
 	{
-		Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
+		Sys_Printf( "Usage: q3map [-v] -scale [-tex] <value> <mapname>\n" );
 		return 0;
 	}
 	
 	/* get scale */
-	scale = atof( argv[ argc - 2 ] );
-	if( scale == 0.0f )
+	scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
+	if(argc >= 4)
+		scale[1] = scale[0] = atof( argv[ argc - 3 ] );
+	if(argc >= 5)
+		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 -scale <value> [-v] <mapname>\n" );
+		Sys_Printf( "Usage: q3map [-v] -scale [-tex] <value> <mapname>\n" );
 		Sys_Printf( "Non-zero scale value required.\n" );
 		return 0;
 	}
@@ -420,59 +1121,168 @@ int ScaleBSPMain( int argc, char **argv )
 	{
 		/* scale origin */
 		GetVectorForKey( &entities[ i ], "origin", vec );
-		if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) )
+		if( (vec[ 0 ] || vec[ 1 ] || vec[ 2 ]) )
 		{
-			VectorScale( vec, scale, vec );
+			vec[0] *= scale[0];
+			vec[1] *= scale[1];
+			vec[2] *= scale[2];
 			sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
 			SetKeyValue( &entities[ i ], "origin", str );
 		}
+
+		a = FloatForKey( &entities[ i ], "angle" );
+		if(a == -1 || a == -2) // z scale
+			axis = 2;
+		else if(fabs(sin(DEG2RAD(a))) < 0.707)
+			axis = 0;
+		else
+			axis = 1;
 		
 		/* scale door lip */
 		f = FloatForKey( &entities[ i ], "lip" );
 		if( f )
 		{
-			f *= scale;
+			f *= scale[axis];
 			sprintf( str, "%f", f );
 			SetKeyValue( &entities[ i ], "lip", str );
 		}
+		
+		/* scale plat height */
+		f = FloatForKey( &entities[ i ], "height" );
+		if( f )
+		{
+			f *= scale[2];
+			sprintf( str, "%f", f );
+			SetKeyValue( &entities[ i ], "height", str );
+		}
+
+		// TODO maybe allow a definition file for entities to specify which values are scaled how?
 	}
 	
 	/* scale models */
 	for( i = 0; i < numBSPModels; i++ )
 	{
-		VectorScale( bspModels[ i ].mins, scale, bspModels[ i ].mins );
-		VectorScale( bspModels[ i ].maxs, scale, bspModels[ i ].maxs );
+		bspModels[ i ].mins[0] *= scale[0];
+		bspModels[ i ].mins[1] *= scale[1];
+		bspModels[ i ].mins[2] *= scale[2];
+		bspModels[ i ].maxs[0] *= scale[0];
+		bspModels[ i ].maxs[1] *= scale[1];
+		bspModels[ i ].maxs[2] *= scale[2];
 	}
 	
 	/* scale nodes */
 	for( i = 0; i < numBSPNodes; i++ )
 	{
-		VectorScale( bspNodes[ i ].mins, scale, bspNodes[ i ].mins );
-		VectorScale( bspNodes[ i ].maxs, scale, bspNodes[ i ].maxs );
+		bspNodes[ i ].mins[0] *= scale[0];
+		bspNodes[ i ].mins[1] *= scale[1];
+		bspNodes[ i ].mins[2] *= scale[2];
+		bspNodes[ i ].maxs[0] *= scale[0];
+		bspNodes[ i ].maxs[1] *= scale[1];
+		bspNodes[ i ].maxs[2] *= scale[2];
 	}
 	
 	/* scale leafs */
 	for( i = 0; i < numBSPLeafs; i++ )
 	{
-		VectorScale( bspLeafs[ i ].mins, scale, bspLeafs[ i ].mins );
-		VectorScale( bspLeafs[ i ].maxs, scale, bspLeafs[ i ].maxs );
+		bspLeafs[ i ].mins[0] *= scale[0];
+		bspLeafs[ i ].mins[1] *= scale[1];
+		bspLeafs[ i ].mins[2] *= scale[2];
+		bspLeafs[ i ].maxs[0] *= scale[0];
+		bspLeafs[ i ].maxs[1] *= scale[1];
+		bspLeafs[ i ].maxs[2] *= scale[2];
 	}
 	
+	if(texscale)
+	{
+		Sys_Printf("Using texture unlocking (and probably breaking texture alignment a lot)\n");
+		old_xyzst = safe_malloc(sizeof(*old_xyzst) * numBSPDrawVerts * 5);
+		for(i = 0; i < numBSPDrawVerts; i++)
+		{
+			old_xyzst[5*i+0] = bspDrawVerts[i].xyz[0];
+			old_xyzst[5*i+1] = bspDrawVerts[i].xyz[1];
+			old_xyzst[5*i+2] = bspDrawVerts[i].xyz[2];
+			old_xyzst[5*i+3] = bspDrawVerts[i].st[0];
+			old_xyzst[5*i+4] = bspDrawVerts[i].st[1];
+		}
+	}
+
 	/* scale drawverts */
 	for( i = 0; i < numBSPDrawVerts; i++ )
-		VectorScale( bspDrawVerts[ i ].xyz, scale, bspDrawVerts[ i ].xyz );
+	{
+		bspDrawVerts[i].xyz[0] *= scale[0];
+		bspDrawVerts[i].xyz[1] *= scale[1];
+		bspDrawVerts[i].xyz[2] *= scale[2];
+		bspDrawVerts[i].normal[0] /= scale[0];
+		bspDrawVerts[i].normal[1] /= scale[1];
+		bspDrawVerts[i].normal[2] /= scale[2];
+		VectorNormalize(bspDrawVerts[i].normal, bspDrawVerts[i].normal);
+	}
+
+	if(texscale)
+	{
+		for(i = 0; i < numBSPDrawSurfaces; i++)
+		{
+			switch(bspDrawSurfaces[i].surfaceType)
+			{
+				case SURFACE_FACE:
+				case SURFACE_META:
+					if(bspDrawSurfaces[i].numIndexes % 3)
+						Error("Not a triangulation!");
+					for(j = bspDrawSurfaces[i].firstIndex; j < bspDrawSurfaces[i].firstIndex + bspDrawSurfaces[i].numIndexes; j += 3)
+					{
+						int ia = bspDrawIndexes[j] + bspDrawSurfaces[i].firstVert, ib = bspDrawIndexes[j+1] + bspDrawSurfaces[i].firstVert, ic = bspDrawIndexes[j+2] + bspDrawSurfaces[i].firstVert;
+						bspDrawVert_t *a = &bspDrawVerts[ia], *b = &bspDrawVerts[ib], *c = &bspDrawVerts[ic];
+						float *oa = &old_xyzst[ia*5], *ob = &old_xyzst[ib*5], *oc = &old_xyzst[ic*5];
+						// extrapolate:
+						//   a->xyz -> oa
+						//   b->xyz -> ob
+						//   c->xyz -> oc
+						ExtrapolateTexcoords(
+							&oa[0], &oa[3],
+							&ob[0], &ob[3],
+							&oc[0], &oc[3],
+							a->xyz, a->st,
+							b->xyz, b->st,
+							c->xyz, c->st);
+					}
+					break;
+			}
+		}
+	}
 	
 	/* scale planes */
-	for( i = 0; i < numBSPPlanes; i++ )
-		bspPlanes[ i ].dist *= scale;
+	if(uniform)
+	{
+		for( i = 0; i < numBSPPlanes; i++ )
+		{
+			bspPlanes[ i ].dist *= scale[0];
+		}
+	}
+	else
+	{
+		for( i = 0; i < numBSPPlanes; i++ )
+		{
+			bspPlanes[ i ].normal[0] /= scale[0];
+			bspPlanes[ i ].normal[1] /= scale[1];
+			bspPlanes[ i ].normal[2] /= scale[2];
+			f = 1/VectorLength(bspPlanes[i].normal);
+			VectorScale(bspPlanes[i].normal, f, bspPlanes[i].normal);
+			bspPlanes[ i ].dist *= f;
+		}
+	}
 	
 	/* scale gridsize */
 	GetVectorForKey( &entities[ 0 ], "gridsize", vec );
 	if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) == 0.0f )
 		VectorCopy( gridSize, vec );
-	VectorScale( vec, scale, vec );
+	vec[0] *= scale[0];
+	vec[1] *= scale[1];
+	vec[2] *= scale[2];
 	sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
 	SetKeyValue( &entities[ 0 ], "gridsize", str );
+
+	/* inject command line parameters */
+	InjectCommandLine(argv, 0, argc - 1);
 	
 	/* write the bsp */
 	UnparseEntities();
@@ -540,6 +1350,8 @@ int ConvertBSPMain( int argc, char **argv )
  			i++;
 			Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
  		}
+		else if( !strcmp( argv[ i ],  "-shadersasbitmap" ) )
+			shadersAsBitmap = qtrue;
 	}
 	
 	/* clean up map name */
@@ -603,7 +1415,7 @@ int main( int argc, char **argv )
 	
 	/* set exit call */
 	atexit( ExitQ3Map );
-	
+
 	/* read general options first */
 	for( i = 1; i < argc; i++ )
 	{
@@ -619,8 +1431,11 @@ int main( int argc, char **argv )
 		/* verbose */
 		else if( !strcmp( argv[ i ], "-v" ) )
 		{
-			verbose = qtrue;
-			argv[ i ] = NULL;
+			if(!verbose)
+			{
+				verbose = qtrue;
+				argv[ i ] = NULL;
+			}
 		}
 		
 		/* force */
@@ -679,6 +1494,10 @@ int main( int argc, char **argv )
 	
 	/* ydnar: new path initialization */
 	InitPaths( &argc, argv );
+
+	/* set game options */
+	if (!patchSubdivisions)
+		patchSubdivisions = game->patchSubdivisions;
 	
 	/* check if we have enough options left to attempt something */
 	if( argc < 2 )
@@ -728,6 +1547,10 @@ int main( int argc, char **argv )
 	else if( !strcmp( argv[ 1 ], "-convert" ) )
 		r = ConvertBSPMain( argc - 1, argv + 1 );
 	
+	/* div0: minimap */
+	else if( !strcmp( argv[ 1 ], "-minimap" ) )
+		r = MiniMapBSPMain(argc - 1, argv + 1);
+
 	/* ydnar: otherwise create a bsp */
 	else
 		r = BSPMain( argc, argv );