-/* -------------------------------------------------------------------------------
+/* -------------------------------------------------------------------------------;
Copyright (C) 1999-2007 id Software, Inc. and contributors.
For a list of contributors, see the accompanying CONTRIBUTORS file.
/* dependencies */
#include "q3map2.h"
+
+
/*
Random()
returns a pseudorandom number between 0 and 1
}
}
-static int MD4BlockChecksum( void * buffer, int length ) {
- unsigned char digest[16];
- int checksum;
- md4_get_digest( buffer, length, digest );
- /* I suppose it has to be done that way for legacy reasons? */
- checksum = digest[0] & ( digest[1] << 8 ) & ( digest[2] << 16 ) & ( digest[3] << 24 );
- checksum ^= digest[4] & ( digest[5] << 8 ) & ( digest[6] << 16 ) & ( digest[7] << 24 );
- checksum ^= digest[8] & ( digest[9] << 8 ) & ( digest[10] << 16 ) & ( digest[11] << 24 );
- checksum ^= digest[12] & ( digest[13] << 8 ) & ( digest[14] << 16 ) & ( digest[15] << 24 );
- return checksum;
+
+/* minimap stuff */
+
+typedef struct minimap_s
+{
+ bspModel_t *model;
+ int width;
+ int height;
+ int samples;
+ float *sample_offsets;
+ float sharpen_boxmult;
+ float sharpen_centermult;
+ float boost, brightness, contrast;
+ 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;
+ }
+}
+
+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( 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] );
+
+ if ( keepaspect ) {
+ 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 ){
+ 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;
+ 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 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 = 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++ )
+ {
+ 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 ], "-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" ) ) {
+ 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" );
+ }
+ 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 );
+ }
+ }
+
+ 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 ) {
+ minimap.sharpen_centermult = 8 * minimapSharpen + 1;
+ minimap.sharpen_boxmult = -minimapSharpen;
+ }
+
+ minimap.data1f = safe_malloc( minimap.width * minimap.height * sizeof( *minimap.data1f ) );
+ data4b = safe_malloc( minimap.width * minimap.height * 4 );
+ 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.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 );
+ RunThreadsOnIndividual( minimap.height, qtrue, MiniMapSharpen );
+ q = minimap.sharpendata1f;
+ }
+ else
+ {
+ q = minimap.data1f;
+ }
+
+ Sys_Printf( "\nConverting..." );
+
+ 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" );
+
+ /* return to sender */
+ return 0;
+}
+
+
+
+
+
+/*
+ MD4BlockChecksum()
+ calculates an md4 checksum for a block of data
+ */
+
+static int MD4BlockChecksum( void *buffer, int length ){
+ return Com_BlockChecksum( buffer, length );
}
/*
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 );
}
+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()
*/
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;
+ float spawn_ref = 0;
/* arg checking */
- if ( argc < 2 ) {
- Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
+ if ( argc < 3 ) {
+ 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 = atof( argv[ argc - 2 ] );
- if ( scale == 0.0f ) {
- Sys_Printf( "Usage: q3map -scale <value> [-v] <mapname>\n" );
+ // 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 - 4 >= i ) {
+ scale[0] = atof( argv[ argc - 4 ] );
+ }
+
+ 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] [-spawn_ref <value>] <value> <mapname>\n" );
Sys_Printf( "Non-zero scale value required.\n" );
return 0;
}
{
/* scale origin */
GetVectorForKey( &entities[ i ], "origin", vec );
- if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) ) {
- VectorScale( vec, scale, 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 );
}
+ 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();
StripExtension( source );
}
+/*
+ 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()
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 -convert [-format <ase|map>] [-v] <mapname>\n" );
+ Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
return 0;
}
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 ] );
}
}
}
+ else if ( !strcmp( argv[ i ], "-ne" ) ) {
+ normalEpsilon = atof( argv[ i + 1 ] );
+ i++;
+ Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
+ }
+ else if ( !strcmp( argv[ i ], "-de" ) ) {
+ distanceEpsilon = atof( argv[ i + 1 ] );
+ i++;
+ Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
+ }
+ else if ( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) ) {
+ shadersAsBitmap = qtrue;
+ }
+ else if ( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) ) {
+ lightmapsAsTexcoord = qtrue;
+ }
+ else if ( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !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 );
+ /* clean up map name */
+ strcpy( source, ExpandArg( argv[i] ) );
+ ExtractFileExtension( source, ext );
- LoadBSPFile( source );
+ if ( !map_allowed && !force_map ) {
+ force_bsp = qtrue;
+ }
- /* parse bsp entities */
- ParseEntities();
+ 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 ) {
/* verbose */
else if ( !strcmp( argv[ i ], "-v" ) ) {
- verbose = qtrue;
- argv[ i ] = NULL;
+ if ( !verbose ) {
+ verbose = qtrue;
+ argv[ i ] = NULL;
+ }
}
/* force */
Sys_Printf( "Q3Map - v1.0r (c) 1999 Id Software Inc.\n" );
Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" );
- Sys_Printf( "GtkRadiant - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
+ Sys_Printf( "NetRadiant - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" );
Sys_Printf( "%s\n", Q3MAP_MOTD );
/* 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 ) {
Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
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 );