make minimap parameters game dependent

git-svn-id: svn://svn.icculus.org/netradiant/trunk@344 61c419a2-8eb2-4b30-bcec-8cead039b335

tools/quake3/q3map2/game_darkplaces.h

@@ -64,6 +64,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_dq.h

@@ -64,6 +64,10 @@ game_t struct
 	qtrue,				/* patch casting enabled */
 	qtrue,				/* compile deluxemaps */
 	1,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_ef.h

@@ -123,6 +123,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_etut.h

@@ -158,6 +158,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_ja.h

@@ -77,6 +77,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"RBSP",				/* bsp file prefix */
 	1,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_jk2.h

@@ -74,6 +74,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"RBSP",				/* bsp file prefix */
 	1,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_nexuiz.h

@@ -73,6 +73,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	1.0f/66.0f,         /* minimap border */
+	"../gfx/%s_mini.tga", /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_prophecy.h

@@ -64,6 +64,10 @@ game_t struct
 	qtrue,				/* patch casting enabled */
 	qtrue,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_qfusion.h

@@ -125,6 +125,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"FBSP",				/* bsp file prefix */
 	1,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_quake3.h

@@ -122,6 +122,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_quakelive.h

@@ -74,6 +74,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	47,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_sof2.h

@@ -149,6 +149,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"RBSP",					/* bsp file prefix */
 	1,						/* bsp file version */
 	qfalse,					/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_tenebrae.h

@@ -122,6 +122,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qtrue,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_tremulous.h

@@ -80,6 +80,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_wolf.h

@@ -139,6 +139,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/game_wolfet.h

@@ -76,6 +76,10 @@ game_t struct
 	qfalse,				/* patch casting enabled */
 	qfalse,				/* compile deluxemaps */
 	0,					/* deluxemaps default mode */
+	512,                /* minimap size */
+	1.0f,               /* minimap sharpener */
+	0.0f,               /* minimap border */
+	"%s.tga",           /* minimap name format */
 	"IBSP",				/* bsp file prefix */
 	46,					/* bsp file version */
 	qfalse,				/* cod-style lump len/ofs order */

tools/quake3/q3map2/main.c

@@ -338,9 +338,8 @@ determines solid non-sky brushes in the world
 
 void MiniMapSetupBrushes( void )
 {
-	int				i, j, b, compileFlags;
+	int				i, b, compileFlags;
 	bspBrush_t		*brush;
-	bspBrushSide_t	*side;
 	bspShader_t		*shader;
 	shaderInfo_t	*si;
 	
@@ -434,7 +433,7 @@ qboolean MiniMapEvaluateSampleOffsets(int *bestj, int *bestk, float *bestval)
 void MiniMapMakeSampleOffsets()
 {
 	int i, j, k, jj, kk;
-	float val, valj, valk, dx, dy, sx, sy, rx, ry;
+	float val, valj, valk, sx, sy, rx, ry;
 
 	Sys_Printf( "Generating good sample offsets (this may take a while)...\n" );
 
@@ -501,12 +500,34 @@ void MiniMapMakeSampleOffsets()
 	}
 }
 
+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 parentpath[1024];
+	char relativeMinimapFilename[1024];
 	float minimapSharpen;
 	float border;
 	byte *data3b, *p;
@@ -534,12 +555,14 @@ int MiniMapBSPMain( int argc, char **argv )
 	minimap.model = &bspModels[0];
 	VectorCopy(minimap.model->mins, mins);
 	VectorCopy(minimap.model->maxs, maxs);
+
 	*minimapFilename = 0;
-	minimapSharpen = 1;
+	minimapSharpen = game->miniMapSharpen;
-	minimap.width = minimap.height = 512;
+	minimap.width = minimap.height = game->miniMapSize;
+	border = game->miniMapBorder;
+
 	minimap.samples = 1;
 	minimap.sample_offsets = NULL;
-	border = 1/66.0; /* good default for Nexuiz */
 
 	/* process arguments */
 	for( i = 1; i < (argc - 1); i++ )
@@ -606,12 +629,8 @@ int MiniMapBSPMain( int argc, char **argv )
 	{
 		ExtractFileBase(source, basename);
 		ExtractFilePath(source, path);
-		if(*path)
+		sprintf(relativeMinimapFilename, game->miniMapNameFormat, basename);
-			path[strlen(path)-1] = 0;
+		MergeRelativePath(minimapFilename, path, relativeMinimapFilename);
-		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);
 	}
 

tools/quake3/q3map2/q3map2.h

@@ -561,6 +561,10 @@ typedef struct game_s
 	qboolean			patchShadows;					/* patch casting enabled */
 	qboolean			deluxeMap;						/* compile deluxemaps */
 	int					deluxeMode;						/* deluxemap mode (0 - modelspace, 1 - tangentspace with renormalization, 2 - tangentspace without renormalization) */
+	int                 miniMapSize;                    /* minimap size */
+	float               miniMapSharpen;                 /* minimap sharpening coefficient */
+	float               miniMapBorder;                  /* minimap border amount */
+	char                *miniMapNameFormat;             /* minimap name format */
 	char				*bspIdent;						/* 4-letter bsp file prefix */
 	int					bspVersion;						/* bsp version to use */
 	qboolean			lumpSwap;						/* cod-style len/ofs order */