make minimap parameters game dependent

[xonotic/netradiant.git] / tools / quake3 / q3map2 / main.c

diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c
index c00cdfbb3580e3745e509cb73245f0d3ee63822a..9d56d89582ea948f6a7c87d6a7267a384a925954 100644 (file)
--- a/tools/quake3/q3map2/main.c
+++ b/tools/quake3/q3map2/main.c
@@ -137,6 +137,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 +157,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)
@@ -195,6 +196,7 @@ static void MiniMapRandomlySupersampled(int y)
        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)
        {
@@ -204,7 +206,7 @@ static void MiniMapRandomlySupersampled(int y)
                for(i = 0; i < minimap.samples; ++i)
                {
                        RandomVector2f(uv);
-                       float thisval = MiniMapSample(
+                       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 */
                        );
@@ -291,7 +293,7 @@ static void MiniMapSharpen(int y)
        }
 }
 
-void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in)
+void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in, float border)
 {
        vec3_t mins, maxs, extend;
        VectorCopy(mins_in, mins);
@@ -313,8 +315,11 @@ void MiniMapMakeMinsMaxs(vec3_t mins_in, vec3_t maxs_in)
                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);
@@ -333,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;
        
@@ -429,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" );
 
@@ -470,7 +474,6 @@ void MiniMapMakeSampleOffsets()
                                        minimap.sample_offsets[2*j+0] = rx;
                                        minimap.sample_offsets[2*j+1] = ry;
                                        i = -1;
-                                       Sys_Printf("%f\n", val);
                                }
                                else
                                {
@@ -485,7 +488,6 @@ void MiniMapMakeSampleOffsets()
                                        minimap.sample_offsets[2*k+0] = rx;
                                        minimap.sample_offsets[2*k+1] = ry;
                                        i = -1;
-                                       Sys_Printf("%f\n", val);
                                }
                                else
                                {
@@ -498,13 +500,36 @@ 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;
        float *q;
        int x, y;
@@ -530,9 +555,12 @@ int MiniMapBSPMain( int argc, char **argv )
        minimap.model = &bspModels[0];
        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;
+
        minimap.samples = 1;
        minimap.sample_offsets = NULL;
 
@@ -570,6 +598,12 @@ int MiniMapBSPMain( int argc, char **argv )
                                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]);
@@ -589,18 +623,14 @@ int MiniMapBSPMain( int argc, char **argv )
                }
        }
 
-       MiniMapMakeMinsMaxs(mins, maxs);
+       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);
+               sprintf(relativeMinimapFilename, game->miniMapNameFormat, basename);
+               MergeRelativePath(minimapFilename, path, relativeMinimapFilename);
                Sys_Printf("Output file name automatically set to %s\n", minimapFilename);
        }