X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmain.c;h=e04f8dc6335fceae1f1051cec3be290130a0459e;hb=7c8b8015d52401571405e5cfade31e92c2d0eb04;hp=02d2fb630b4cfea39d3bb4c4802e9f606b5463db;hpb=f560e2703b3ccb1cab0f4071ee8c676d8d3f8068;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index 02d2fb63..e04f8dc6 100644
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -64,6 +64,494 @@ 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;
+	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
+			bspBrushSide_t *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;
+}
+
+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;
+
+	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 + (2 * Random() - 0.5) * dx, /* exaggerated random pattern for better results */
+				ymin + (2 * Random() - 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 / (float) minimap.height);
+
+	for(x = 0; x < minimap.width; ++x)
+	{
+		float xmin = minimap.mins[0] + minimap.size[0] * (x / (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, maxs, extend;
+	VectorCopy(minimap.model->mins, mins);
+	VectorCopy(minimap.model->maxs, 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;
+	}
+
+	VectorSubtract(maxs, mins, extend);
+	VectorScale(extend, 1.0 / 64.0, 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 ];
+		
+		/* 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;
+		}
+		
+		/* 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 );
+}
+
+int MiniMapBSPMain( int argc, char **argv )
+{
+	char minimapFilename[1024];
+	char basename[1024];
+	char path[1024];
+	char parentpath[1024];
+	float minimapSharpen;
+	byte *data3b, *p;
+	float *q;
+	int x, y;
+	int i;
+
+	/* 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];
+	MiniMapMakeMinsMaxs();
+
+	*minimapFilename = 0;
+	minimapSharpen = 1;
+	minimap.width = minimap.height = 512;
+	minimap.samples = 1;
+	minimap.sample_offsets = NULL;
+
+	/* 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);
+			/* TODO use a better pattern */
+			for(x = 0; x < 2 * minimap.samples; ++x)
+				minimap.sample_offsets[x] = Random();
+ 		}
+		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 ],  "-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) )
+ 		{
+			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];
+			i += 6;
+			Sys_Printf( "Map mins/maxs overridden\n" );
+ 		}
+	}
+
+	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 +562,6 @@ static int MD4BlockChecksum( void *buffer, int length )
 	return Com_BlockChecksum(buffer, length);
 }
 
-
-
 /*
 FixAAS()
 resets an aas checksum to match the given BSP
@@ -811,8 +1297,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 */
@@ -924,6 +1413,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 );