X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmain.c;h=75bc4608703040218db568b49aceaa85eaf70162;hb=11c140ba5e462d14fc1708c60e099746d4c1fded;hp=98d77ef9dde8ad8764324d345cba77abf8d2409e;hpb=a255fbd84e64e4f8bb6e6786b6f65579071742b6;p=xonotic%2Fnetradiant.git diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index 98d77ef9..75bc4608 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -1,4 +1,4 @@ -/* -------------------------------------------------------------------------------; +/* ------------------------------------------------------------------------------- Copyright (C) 1999-2007 id Software, Inc. and contributors. For a list of contributors, see the accompanying CONTRIBUTORS file. @@ -35,8 +35,7 @@ /* dependencies */ #include "q3map2.h" - - +#include /* Random() @@ -60,1419 +59,43 @@ char *Q_strncpyz( char *dst, const char *src, size_t len ) { char *Q_strcat( char *dst, size_t dlen, const char *src ) { - size_t n = strlen( dst ); - - if ( n > dlen ) { - abort(); /* buffer overflow */ - } - - return Q_strncpyz( dst + n, src, dlen - n ); -} - - -char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) { - size_t n = strlen( dst ); - - if ( n > dlen ) { - abort(); /* buffer overflow */ - } - - return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) ); -} - - -/* - ExitQ3Map() - cleanup routine - */ - -static void ExitQ3Map( void ){ - BSPFilesCleanup(); - if ( mapDrawSurfs != NULL ) { - free( mapDrawSurfs ); - } -} - - - -/* 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] \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 ); -} - -/* - FixAAS() - resets an aas checksum to match the given BSP - */ - -int FixAAS( int argc, char **argv ){ - int length, checksum; - void *buffer; - FILE *file; - char aas[ 1024 ], **ext; - char *exts[] = - { - ".aas", - "_b0.aas", - "_b1.aas", - NULL - }; - - - /* arg checking */ - if ( argc < 2 ) { - Sys_Printf( "Usage: q3map -fixaas [-v] \n" ); - return 0; - } - - /* do some path mangling */ - strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - - /* note it */ - Sys_Printf( "--- FixAAS ---\n" ); - - /* load the bsp */ - Sys_Printf( "Loading %s\n", source ); - length = LoadFile( source, &buffer ); - - /* create bsp checksum */ - Sys_Printf( "Creating checksum...\n" ); - checksum = LittleLong( MD4BlockChecksum( buffer, length ) ); - - /* write checksum to aas */ - ext = exts; - while ( *ext ) - { - /* mangle name */ - strcpy( aas, source ); - StripExtension( aas ); - strcat( aas, *ext ); - Sys_Printf( "Trying %s\n", aas ); - ext++; - - /* fix it */ - file = fopen( aas, "r+b" ); - if ( !file ) { - continue; - } - if ( fwrite( &checksum, 4, 1, file ) != 1 ) { - Error( "Error writing checksum to %s", aas ); - } - fclose( file ); - } - - /* return to sender */ - return 0; -} - - - -/* - AnalyzeBSP() - ydnar - analyzes a Quake engine BSP file - */ - -typedef struct abspHeader_s -{ - char ident[ 4 ]; - int version; - - bspLump_t lumps[ 1 ]; /* unknown size */ -} -abspHeader_t; - -typedef struct abspLumpTest_s -{ - int radix, minCount; - char *name; -} -abspLumpTest_t; - -int AnalyzeBSP( int argc, char **argv ){ - abspHeader_t *header; - int size, i, version, offset, length, lumpInt, count; - char ident[ 5 ]; - void *lump; - float lumpFloat; - char lumpString[ 1024 ], source[ 1024 ]; - qboolean lumpSwap = qfalse; - abspLumpTest_t *lumpTest; - static abspLumpTest_t lumpTests[] = - { - { sizeof( bspPlane_t ), 6, "IBSP LUMP_PLANES" }, - { sizeof( bspBrush_t ), 1, "IBSP LUMP_BRUSHES" }, - { 8, 6, "IBSP LUMP_BRUSHSIDES" }, - { sizeof( bspBrushSide_t ), 6, "RBSP LUMP_BRUSHSIDES" }, - { sizeof( bspModel_t ), 1, "IBSP LUMP_MODELS" }, - { sizeof( bspNode_t ), 2, "IBSP LUMP_NODES" }, - { sizeof( bspLeaf_t ), 1, "IBSP LUMP_LEAFS" }, - { 104, 3, "IBSP LUMP_DRAWSURFS" }, - { 44, 3, "IBSP LUMP_DRAWVERTS" }, - { 4, 6, "IBSP LUMP_DRAWINDEXES" }, - { 128 * 128 * 3, 1, "IBSP LUMP_LIGHTMAPS" }, - { 256 * 256 * 3, 1, "IBSP LUMP_LIGHTMAPS (256 x 256)" }, - { 512 * 512 * 3, 1, "IBSP LUMP_LIGHTMAPS (512 x 512)" }, - { 0, 0, NULL } - }; - - - /* arg checking */ - if ( argc < 1 ) { - Sys_Printf( "Usage: q3map -analyze [-lumpswap] [-v] \n" ); - return 0; - } - - /* process arguments */ - for ( i = 1; i < ( argc - 1 ); i++ ) - { - /* -format map|ase|... */ - if ( !strcmp( argv[ i ], "-lumpswap" ) ) { - Sys_Printf( "Swapped lump structs enabled\n" ); - lumpSwap = qtrue; - } - } - - /* clean up map name */ - strcpy( source, ExpandArg( argv[ i ] ) ); - Sys_Printf( "Loading %s\n", source ); - - /* load the file */ - size = LoadFile( source, (void**) &header ); - if ( size == 0 || header == NULL ) { - Sys_Printf( "Unable to load %s.\n", source ); - return -1; - } - - /* analyze ident/version */ - memcpy( ident, header->ident, 4 ); - ident[ 4 ] = '\0'; - version = LittleLong( header->version ); - - Sys_Printf( "Identity: %s\n", ident ); - Sys_Printf( "Version: %d\n", version ); - Sys_Printf( "---------------------------------------\n" ); - - /* analyze each lump */ - for ( i = 0; i < 100; i++ ) - { - /* call of duty swapped lump pairs */ - if ( lumpSwap ) { - offset = LittleLong( header->lumps[ i ].length ); - length = LittleLong( header->lumps[ i ].offset ); - } - - /* standard lump pairs */ - else - { - offset = LittleLong( header->lumps[ i ].offset ); - length = LittleLong( header->lumps[ i ].length ); - } - - /* extract data */ - lump = (byte*) header + offset; - lumpInt = LittleLong( (int) *( (int*) lump ) ); - lumpFloat = LittleFloat( (float) *( (float*) lump ) ); - 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 ); - Sys_Printf( "Offset: %d bytes\n", offset ); - Sys_Printf( "Length: %d bytes\n", length ); - - /* only operate on valid lumps */ - if ( length > 0 ) { - /* print data in 4 formats */ - Sys_Printf( "As hex: %08X\n", lumpInt ); - Sys_Printf( "As int: %d\n", lumpInt ); - Sys_Printf( "As float: %f\n", lumpFloat ); - Sys_Printf( "As string: %s\n", lumpString ); - - /* guess lump type */ - if ( lumpString[ 0 ] == '{' && lumpString[ 2 ] == '"' ) { - Sys_Printf( "Type guess: IBSP LUMP_ENTITIES\n" ); - } - else if ( strstr( lumpString, "textures/" ) ) { - Sys_Printf( "Type guess: IBSP LUMP_SHADERS\n" ); - } - else - { - /* guess based on size/count */ - for ( lumpTest = lumpTests; lumpTest->radix > 0; lumpTest++ ) - { - if ( ( length % lumpTest->radix ) != 0 ) { - continue; - } - count = length / lumpTest->radix; - if ( count < lumpTest->minCount ) { - continue; - } - Sys_Printf( "Type guess: %s (%d x %d)\n", lumpTest->name, count, lumpTest->radix ); - } - } - } - - Sys_Printf( "---------------------------------------\n" ); - - /* end of file */ - if ( offset + length >= size ) { - break; - } - } - - /* last stats */ - Sys_Printf( "Lump count: %d\n", i + 1 ); - Sys_Printf( "File size: %d bytes\n", size ); - - /* return to caller */ - return 0; -} - - - -/* - BSPInfo() - emits statistics about the bsp file - */ - -int BSPInfo( int count, char **fileNames ){ - int i; - char source[ 1024 ], ext[ 64 ]; - int size; - FILE *f; - - - /* dummy check */ - if ( count < 1 ) { - Sys_Printf( "No files to dump info for.\n" ); - return -1; - } - - /* enable info mode */ - infoMode = qtrue; - - /* walk file list */ - for ( i = 0; i < count; i++ ) - { - Sys_Printf( "---------------------------------\n" ); - - /* mangle filename and get size */ - strcpy( source, fileNames[ i ] ); - ExtractFileExtension( source, ext ); - if ( !Q_stricmp( ext, "map" ) ) { - StripExtension( source ); - } - DefaultExtension( source, ".bsp" ); - f = fopen( source, "rb" ); - if ( f ) { - size = Q_filelength( f ); - fclose( f ); - } - else{ - size = 0; - } - - /* load the bsp file and print lump sizes */ - Sys_Printf( "%s\n", source ); - LoadBSPFile( source ); - PrintBSPFileSizes(); - - /* print sizes */ - Sys_Printf( "\n" ); - Sys_Printf( " total %9d\n", size ); - Sys_Printf( " %9d KB\n", size / 1024 ); - Sys_Printf( " %9d MB\n", size / ( 1024 * 1024 ) ); - - Sys_Printf( "---------------------------------\n" ); - } - - /* return count */ - return 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() - amaze and confuse your enemies with wierd scaled maps! - */ - -int ScaleBSPMain( int argc, char **argv ){ - 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 < 3 ) { - Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref ] \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 */ - // 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 ] \n" ); - Sys_Printf( "Non-zero scale value required.\n" ); - return 0; - } - - /* do some path mangling */ - strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - - /* load the bsp */ - Sys_Printf( "Loading %s\n", source ); - LoadBSPFile( source ); - ParseEntities(); - - /* note it */ - Sys_Printf( "--- ScaleBSP ---\n" ); - Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities ); - - /* scale entity keys */ - for ( i = 0; i < numBSPEntities && i < numEntities; i++ ) - { - /* scale origin */ - GetVectorForKey( &entities[ i ], "origin", 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[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++ ) - { - 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++ ) - { - 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++ ) - { - 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++ ) - { - 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; - } - } - } + size_t n = strlen( dst ); - /* scale planes */ - 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; - } + if ( n > dlen ) { + abort(); /* buffer overflow */ } - /* scale gridsize */ - GetVectorForKey( &entities[ 0 ], "gridsize", vec ); - if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) { - VectorCopy( gridSize, vec ); + return Q_strncpyz( dst + n, src, dlen - n ); +} + + +char *Q_strncat( char *dst, size_t dlen, const char *src, size_t slen ) { + size_t n = strlen( dst ); + + if ( n > dlen ) { + abort(); /* buffer overflow */ } - 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 ); + return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) ); +} - /* write the bsp */ - UnparseEntities(); - StripExtension( source ); - DefaultExtension( source, "_s.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); - /* return to sender */ - return 0; +/* + ExitQ3Map() + cleanup routine + */ + +static void ExitQ3Map( void ){ + BSPFilesCleanup(); + if ( mapDrawSurfs != NULL ) { + free( mapDrawSurfs ); + } } /* ShiftBSPMain() - shifts a map: works correctly only with axial faces, placed in positive half of axis - for testing physics with huge coordinates + shifts a map: for testing physics with huge coordinates */ int ShiftBSPMain( int argc, char **argv ){ @@ -1646,244 +269,678 @@ int ShiftBSPMain( int argc, char **argv ){ } +void FixDOSName( char *src ){ + if ( src == NULL ) { + return; + } + + while ( *src ) + { + if ( *src == '\\' ) { + *src = '/'; + } + src++; + } +} /* - 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; + Check if newcoming texture is unique and not excluded +*/ +void tex2list( char texlist[512][MAX_QPATH], int *texnum, char EXtex[2048][MAX_QPATH], int *EXtexnum ){ int i; + if ( token[0] == '\0') return; + StripExtension( token ); + FixDOSName( token ); + for ( i = 0; i < *texnum; i++ ){ + if ( !stricmp( texlist[i], token ) ) return; + } + for ( i = 0; i < *EXtexnum; i++ ){ + if ( !stricmp( EXtex[i], token ) ) return; + } + strcpy ( texlist[*texnum], token ); + (*texnum)++; + return; +} - 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++ ) +/* + Check if newcoming res is unique +*/ +void res2list( char data[512][MAX_QPATH], int *num ){ + int i; + if ( data[*num][0] == '\0') return; + for ( i = 0; i < *num; i++ ){ + if ( !stricmp( data[i], data[*num] ) ) return; + } + (*num)++; + return; +} + +void parseEXblock ( char data[512][MAX_QPATH], int *num, const char *exName ){ + if ( !GetToken( qtrue ) || strcmp( token, "{" ) ) { + Error( "ReadExclusionsFile: %s, line %d: { not found", exName, scriptline ); + } + while ( 1 ) { - /* get entity */ - entity = &entities[ mapEntityNum ]; - if ( entity->brushes == NULL && entity->patches == NULL ) { - continue; + if ( !GetToken( qtrue ) ) { + break; + } + if ( !strcmp( token, "}" ) ) { + break; + } + if ( token[0] == '{' ) { + Error( "ReadExclusionsFile: %s, line %d: brace, opening twice in a row.", exName, scriptline ); } - if ( mapEntityNum != 0 ) { - sprintf( modelValue, "*%d", models++ ); - SetKeyValue( entity, "model", modelValue ); + /* add to list */ + strcpy( data[*num], token ); + (*num)++; + } + return; +} + +char q3map2path[1024]; +/* + pk3BSPMain() + map autopackager, works for Q3 type of shaders and ents + */ + +int pk3BSPMain( int argc, char **argv ){ + int i, j; + qboolean dbg = qfalse, png = qfalse; + + /* process arguments */ + for ( i = 1; i < ( argc - 1 ); i++ ){ + if ( !strcmp( argv[ i ], "-dbg" ) ) { + dbg = qtrue; + } + else if ( !strcmp( argv[ i ], "-png" ) ) { + png = qtrue; } + } + + + + /* do some path mangling */ + strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); + StripExtension( source ); + DefaultExtension( source, ".bsp" ); + + /* load the bsp */ + Sys_Printf( "Loading %s\n", source ); + LoadBSPFile( source ); + ParseEntities(); + + + char packname[ 1024 ], base[ 1024 ], nameOFmap[ 1024 ]; + int len; + strcpy( packname, EnginePath ); + - /* process the model */ - Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels ); - BeginModel(); + /* copy map name */ + strcpy( base, source ); + StripExtension( base ); - entity->firstDrawSurf = numMapDrawSurfs; + /* extract map name */ + len = strlen( base ) - 1; + while ( len > 0 && base[ len ] != '/' && base[ len ] != '\\' ) + len--; + strcpy( nameOFmap, &base[ len + 1 ] ); - ClearMetaTriangles(); - PatchMapDrawSurfs( entity ); - if ( mapEntityNum == 0 && need_tree ) { - faces = MakeStructuralBSPFaceList( entities[0].brushes ); - tree = FaceBSP( faces ); - node = tree->headnode; + qboolean dsSHs[512] = {qfalse}; + + for ( i = 0; i < numBSPDrawSurfaces; i++ ){ + /* can't exclude nodraw patches here (they want shaders :0!) */ + //if ( !( bspDrawSurfaces[i].surfaceType == 2 && bspDrawSurfaces[i].numIndexes == 0 ) ) dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue; + dsSHs[bspDrawSurfaces[i].shaderNum] = qtrue; + //Sys_Printf( "%s\n", bspShaders[bspDrawSurfaces[i].shaderNum].shader ); + } + + int pk3ShadersN = 0; + char pk3Shaders[512][MAX_QPATH]; + int pk3SoundsN = 0; + char pk3Sounds[512][MAX_QPATH]; + int pk3ShaderfilesN = 0; + char pk3Shaderfiles[512][MAX_QPATH]; + int pk3TexturesN = 0; + char pk3Textures[512][MAX_QPATH]; + int pk3VideosN = 0; + char pk3Videos[512][MAX_QPATH]; + + + + for ( i = 0; i < numBSPShaders; i++ ){ + if ( dsSHs[i] ){ + strcpy( pk3Shaders[pk3ShadersN], bspShaders[i].shader ); + res2list( pk3Shaders, &pk3ShadersN ); + //pk3ShadersN++; + //Sys_Printf( "%s\n", bspShaders[i].shader ); } - else - { - node = AllocNode(); - node->planenum = PLANENUM_LEAF; - tree = AllocTree(); - tree->headnode = node; + } + + //ent keys + epair_t *ep; + for ( ep = entities[0].epairs; ep != NULL; ep = ep->next ) + { + if ( !strnicmp( ep->key, "vertexremapshader", 17 ) ) { + sscanf( ep->value, "%*[^;] %*[;] %s", pk3Shaders[pk3ShadersN] ); + res2list( pk3Shaders, &pk3ShadersN ); } + } + strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[0], "music" ) ); + res2list( pk3Sounds, &pk3SoundsN ); - /* 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 ); + for ( i = 0; i < numBSPEntities && i < numEntities; i++ ) + { + strcpy( pk3Sounds[pk3SoundsN], ValueForKey( &entities[i], "noise" ) ); + if ( pk3Sounds[pk3SoundsN][0] != '*' ) res2list( pk3Sounds, &pk3SoundsN ); + + if ( !stricmp( ValueForKey( &entities[i], "classname" ), "func_plat" ) ){ + strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_strt.wav"); + res2list( pk3Sounds, &pk3SoundsN ); + strcpy( pk3Sounds[pk3SoundsN], "sound/movers/plats/pt1_end.wav"); + res2list( pk3Sounds, &pk3SoundsN ); + } + if ( !stricmp( ValueForKey( &entities[i], "classname" ), "target_push" ) ){ + if ( !(IntForKey( &entities[i], "spawnflags") & 1) ){ + strcpy( pk3Sounds[pk3SoundsN], "sound/misc/windfly.wav"); + res2list( pk3Sounds, &pk3SoundsN ); } } + strcpy( pk3Shaders[pk3ShadersN], ValueForKey( &entities[i], "targetShaderNewName" ) ); + res2list( pk3Shaders, &pk3ShadersN ); + } - if ( meta ) { - ClassifyEntitySurfaces( entity ); - MakeEntityDecals( entity ); - MakeEntityMetaTriangles( entity ); - SmoothMetaTriangles(); - MergeMetaTriangles(); + //levelshot + sprintf( pk3Shaders[ pk3ShadersN ], "levelshots/%s", nameOFmap ); + res2list( pk3Shaders, &pk3ShadersN ); + + + if( dbg ){ + Sys_Printf( "\tDrawsurface+ent calls....%i\n", pk3ShadersN ); + for ( i = 0; i < pk3ShadersN; i++ ){ + Sys_Printf( "%s\n", pk3Shaders[i] ); } - FilterDrawsurfsIntoTree( entity, tree ); + Sys_Printf( "\tSounds....%i\n", pk3SoundsN ); + for ( i = 0; i < pk3SoundsN; i++ ){ + Sys_Printf( "%s\n", pk3Sounds[i] ); + } + } - FilterStructuralBrushesIntoTree( entity, tree ); - FilterDetailBrushesIntoTree( entity, tree ); + vfsListShaderFiles( pk3Shaderfiles, &pk3ShaderfilesN ); - EmitBrushes( entity->brushes, &entity->firstBrush, &entity->numBrushes ); - EndModel( entity, node ); + if( dbg ){ + Sys_Printf( "\tSchroider fileses.....%i\n", pk3ShaderfilesN ); + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + Sys_Printf( "%s\n", pk3Shaderfiles[i] ); + } } - EndBSPFile( qfalse ); -} -/* - ConvertBSPMain() - main argument processing function for bsp conversion - */ -int ConvertBSPMain( int argc, char **argv ){ - int i; - int ( *convertFunc )( char * ); - game_t *convertGame; - char ext[1024]; - qboolean map_allowed, force_bsp, force_map; + /* load exclusions file */ + int EXpk3TexturesN = 0; + char EXpk3Textures[2048][MAX_QPATH]; + int EXpk3ShadersN = 0; + char EXpk3Shaders[2048][MAX_QPATH]; + int EXpk3SoundsN = 0; + char EXpk3Sounds[2048][MAX_QPATH]; + int EXpk3ShaderfilesN = 0; + char EXpk3Shaderfiles[512][MAX_QPATH]; + int EXpk3VideosN = 0; + char EXpk3Videos[512][MAX_QPATH]; + char exName[ 1024 ]; + byte *buffer; + int size; - /* set default */ - convertFunc = ConvertBSPToASE; - convertGame = NULL; - map_allowed = qfalse; - force_bsp = qfalse; - force_map = qfalse; + strcpy( exName, q3map2path ); + char *cut = strrchr( exName, '\\' ); + char *cut2 = strrchr( exName, '/' ); + if ( cut == NULL && cut2 == NULL ){ + Sys_Printf( "WARNING: Unable to load exclusions file.\n" ); + goto skipEXfile; + } + if ( cut2 > cut ) cut = cut2; + //cut++; + cut[1] = '\0'; + strcat( exName, game->arg ); + strcat( exName, ".exclude" ); - /* arg checking */ - if ( argc < 1 ) { - Sys_Printf( "Usage: q3map -convert [-format ] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] \n" ); - return 0; + Sys_Printf( "Loading %s\n", exName ); + size = TryLoadFile( exName, (void**) &buffer ); + if ( size <= 0 ) { + Sys_Printf( "WARNING: Unable to find exclusions file %s.\n", exName ); + goto skipEXfile; } - /* process arguments */ - for ( i = 1; i < ( argc - 1 ); i++ ) + /* parse the file */ + ParseFromMemory( (char *) buffer, size ); + + /* blocks pointers */ + //int *exptrN; + //char *exptr[512][64]; + + + /* tokenize it */ + while ( 1 ) { - /* -format map|ase|... */ - if ( !strcmp( argv[ i ], "-format" ) ) { - i++; - if ( !Q_stricmp( argv[ i ], "ase" ) ) { - convertFunc = ConvertBSPToASE; - map_allowed = qfalse; + /* test for end of file */ + if ( !GetToken( qtrue ) ) { + break; + } + + /* blocks */ + if ( !stricmp( token, "textures" ) ){ + parseEXblock ( EXpk3Textures, &EXpk3TexturesN, exName ); + } + else if ( !stricmp( token, "shaders" ) ){ + parseEXblock ( EXpk3Shaders, &EXpk3ShadersN, exName ); + } + else if ( !stricmp( token, "shaderfiles" ) ){ + parseEXblock ( EXpk3Shaderfiles, &EXpk3ShaderfilesN, exName ); + } + else if ( !stricmp( token, "sounds" ) ){ + parseEXblock ( EXpk3Sounds, &EXpk3SoundsN, exName ); + } + else if ( !stricmp( token, "videos" ) ){ + parseEXblock ( EXpk3Videos, &EXpk3VideosN, exName ); + } + else{ + Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline ); + } + } + + /* free the buffer */ + free( buffer ); + +skipEXfile: + + if( dbg ){ + Sys_Printf( "\tEXpk3Textures....%i\n", EXpk3TexturesN ); + for ( i = 0; i < EXpk3TexturesN; i++ ) Sys_Printf( "%s\n", EXpk3Textures[i] ); + Sys_Printf( "\tEXpk3Shaders....%i\n", EXpk3ShadersN ); + for ( i = 0; i < EXpk3ShadersN; i++ ) Sys_Printf( "%s\n", EXpk3Shaders[i] ); + Sys_Printf( "\tEXpk3Shaderfiles....%i\n", EXpk3ShaderfilesN ); + for ( i = 0; i < EXpk3ShaderfilesN; i++ ) Sys_Printf( "%s\n", EXpk3Shaderfiles[i] ); + Sys_Printf( "\tEXpk3Sounds....%i\n", EXpk3SoundsN ); + for ( i = 0; i < EXpk3SoundsN; i++ ) Sys_Printf( "%s\n", EXpk3Sounds[i] ); + Sys_Printf( "\tEXpk3Videos....%i\n", EXpk3VideosN ); + for ( i = 0; i < EXpk3VideosN; i++ ) Sys_Printf( "%s\n", EXpk3Videos[i] ); + } + + char temp[ 1024 ]; + + //Parse Shader Files + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + qboolean wantShader = qfalse; + qboolean wantShaderFile = qfalse; + char shadername[ 1024 ]; + char lastwantedShader[ 1024 ]; + + + /* load the shader */ + sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] ); + LoadScriptFile( temp, 0 ); + + /* tokenize it */ + while ( 1 ) + { + /* test for end of file */ + if ( !GetToken( qtrue ) ) { + break; } - else if ( !Q_stricmp( argv[ i ], "obj" ) ) { - convertFunc = ConvertBSPToOBJ; - map_allowed = qfalse; + //dump shader names + if( dbg ) Sys_Printf( "%s\n", token ); + + /* do wanna le shader? */ + wantShader = qfalse; + for ( j = 0; j < pk3ShadersN; j++ ){ + if ( !stricmp( pk3Shaders[j], token) ){ + strcpy ( shadername, pk3Shaders[j] ); + pk3Shaders[j][0] = '\0'; + wantShader = qtrue; + break; + } } - else if ( !Q_stricmp( argv[ i ], "map_bp" ) ) { - convertFunc = ConvertBSPToMap_BP; - map_allowed = qtrue; + + /* handle { } section */ + if ( !GetToken( qtrue ) ) { + break; } - else if ( !Q_stricmp( argv[ i ], "map" ) ) { - convertFunc = ConvertBSPToMap; - map_allowed = qtrue; + if ( strcmp( token, "{" ) ) { + Error( "ParseShaderFile: %s, line %d: { not found!\nFound instead: %s", + temp, scriptline, token ); } - else + + while ( 1 ) { - convertGame = GetGame( argv[ i ] ); - map_allowed = qfalse; - if ( convertGame == NULL ) { - Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] ); + /* get the next token */ + if ( !GetToken( qtrue ) ) { + break; + } + if ( !strcmp( token, "}" ) ) { + break; + } + + + /* ----------------------------------------------------------------- + shader stages (passes) + ----------------------------------------------------------------- */ + + /* parse stage directives */ + if ( !strcmp( token, "{" ) ) { + while ( 1 ) + { + if ( !GetToken( qtrue ) ) { + break; + } + if ( !strcmp( token, "}" ) ) { + break; + } + if ( !wantShader ) continue; + + /* digest any images */ + if ( !stricmp( token, "map" ) || + !stricmp( token, "clampMap" ) ) { + + /* get an image */ + GetToken( qfalse ); + if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) { + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + } + } + else if ( !stricmp( token, "animMap" ) || + !stricmp( token, "clampAnimMap" ) ) { + GetToken( qfalse );// skip num + while ( TokenAvailable() ){ + GetToken( qfalse ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + } + } + else if ( !stricmp( token, "videoMap" ) ){ + GetToken( qfalse ); + FixDOSName( token ); + if ( strchr( token, "/" ) == NULL ){ + sprintf( temp, "video/%s", token ); + strcpy( token, temp ); + } + for ( j = 0; j < pk3VideosN; j++ ){ + if ( !stricmp( pk3Videos[j], token ) ){ + goto away; + } + } + for ( j = 0; j < EXpk3VideosN; j++ ){ + if ( !stricmp( EXpk3Videos[j], token ) ){ + goto away; + } + } + strcpy ( pk3Videos[pk3VideosN], token ); + pk3VideosN++; + away: + j = 0; + } + } + } + /* skip to the next shader */ + else if ( !wantShader ) continue; + + /* ----------------------------------------------------------------- + surfaceparm * directives + ----------------------------------------------------------------- */ + + /* match surfaceparm */ + else if ( !stricmp( token, "surfaceparm" ) ) { + GetToken( qfalse ); + if ( !stricmp( token, "nodraw" ) ) { + wantShader = qfalse; + } + } + + /* skyparms */ + else if ( !stricmp( token, "skyParms" ) ) { + /* get image base */ + GetToken( qfalse ); + + /* ignore bogus paths */ + if ( stricmp( token, "-" ) && stricmp( token, "full" ) ) { + strcpy ( temp, token ); + sprintf( token, "%s_up", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + sprintf( token, "%s_dn", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + sprintf( token, "%s_lf", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + sprintf( token, "%s_rt", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + sprintf( token, "%s_bk", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + sprintf( token, "%s_ft", temp ); + tex2list( pk3Textures, &pk3TexturesN, EXpk3Textures, &EXpk3TexturesN ); + } + /* skip rest of line */ + GetToken( qfalse ); + GetToken( qfalse ); + } + } + //exclude shader + if ( wantShader ){ + for ( j = 0; j < EXpk3ShadersN; j++ ){ + if ( !stricmp( EXpk3Shaders[j], shadername ) ){ + wantShader = qfalse; + break; + } + } + /* shouldnt make shaders for shipped with the game textures aswell */ + if ( wantShader ){ + for ( j = 0; j < EXpk3TexturesN; j++ ){ + if ( !stricmp( EXpk3Textures[j], shadername ) ){ + wantShader = qfalse; + break; + } + } + } + if ( wantShader ){ + wantShaderFile = qtrue; + strcpy( lastwantedShader, shadername ); } } } - else if ( !strcmp( argv[ i ], "-ne" ) ) { - normalEpsilon = atof( argv[ i + 1 ] ); - i++; - Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon ); + //exclude shader file + if ( wantShaderFile ){ + for ( j = 0; j < EXpk3ShaderfilesN; j++ ){ + if ( !stricmp( EXpk3Shaderfiles[j], pk3Shaderfiles[ i ] ) ){ + Sys_Printf( "WARNING: excluded shader %s, since it was located in restricted shader file: %s\n", lastwantedShader, pk3Shaderfiles[i] ); + pk3Shaderfiles[ i ][0] = '\0'; + break; + } + } } - else if ( !strcmp( argv[ i ], "-de" ) ) { - distanceEpsilon = atof( argv[ i + 1 ] ); - i++; - Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon ); + else { + pk3Shaderfiles[ i ][0] = '\0'; + } + + } + + + +/* exclude stuff */ +//pure textures (shader ones are done) + for ( i = 0; i < pk3ShadersN; i++ ){ + if ( pk3Shaders[i][0] != '\0' ){ + FixDOSName( pk3Shaders[i] ); + for ( j = 0; j < pk3TexturesN; j++ ){ + if ( !stricmp( pk3Shaders[i], pk3Textures[j] ) ){ + pk3Shaders[i][0] = '\0'; + break; + } + } + if ( pk3Shaders[i][0] == '\0' ) continue; + for ( j = 0; j < EXpk3TexturesN; j++ ){ + if ( !stricmp( pk3Shaders[i], EXpk3Textures[j] ) ){ + pk3Shaders[i][0] = '\0'; + break; + } + } + } + } + +//snds + for ( i = 0; i < pk3SoundsN; i++ ){ + FixDOSName( pk3Sounds[i] ); + for ( j = 0; j < EXpk3SoundsN; j++ ){ + if ( !stricmp( pk3Sounds[i], EXpk3Sounds[j] ) ){ + pk3Sounds[i][0] = '\0'; + break; + } } - else if ( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) ) { - shadersAsBitmap = qtrue; + } + + if( dbg ){ + Sys_Printf( "\tShader referenced textures....%i\n", pk3TexturesN ); + for ( i = 0; i < pk3TexturesN; i++ ){ + Sys_Printf( "%s\n", pk3Textures[i] ); } - else if ( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) ) { - lightmapsAsTexcoord = qtrue; + Sys_Printf( "\tShader files....\n" ); + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + if ( pk3Shaderfiles[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaderfiles[i] ); } - else if ( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !strcmp( argv[ i ], "-deluxemapsastexcoord" ) ) { - lightmapsAsTexcoord = qtrue; - deluxemap = qtrue; + Sys_Printf( "\tPure textures....\n" ); + for ( i = 0; i < pk3ShadersN; i++ ){ + if ( pk3Shaders[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaders[i] ); } - else if ( !strcmp( argv[ i ], "-readbsp" ) ) { - force_bsp = qtrue; + } + + + + sprintf( packname, "%s/%s_autopacked.pk3", EnginePath, nameOFmap ); + remove( packname ); + + Sys_Printf( "--- ZipZip ---\n" ); + + Sys_Printf( "\n\tShader referenced textures....\n" ); + + for ( i = 0; i < pk3TexturesN; i++ ){ + if ( png ){ + sprintf( temp, "%s.png", pk3Textures[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } } - else if ( !strcmp( argv[ i ], "-readmap" ) ) { - force_map = qtrue; + sprintf( temp, "%s.tga", pk3Textures[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; } - else if ( !strcmp( argv[ i ], "-meta" ) ) { - meta = qtrue; + sprintf( temp, "%s.jpg", pk3Textures[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; } - else if ( !strcmp( argv[ i ], "-patchmeta" ) ) { - meta = qtrue; - patchMeta = qtrue; + Sys_Printf( " !FAIL! %s\n", pk3Textures[i] ); + } + + Sys_Printf( "\n\tPure textures....\n" ); + + for ( i = 0; i < pk3ShadersN; i++ ){ + if ( pk3Shaders[i][0] != '\0' ){ + if ( png ){ + sprintf( temp, "%s.png", pk3Shaders[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } + } + sprintf( temp, "%s.tga", pk3Shaders[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } + sprintf( temp, "%s.jpg", pk3Shaders[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } + Sys_Printf( " !FAIL! %s\n", pk3Shaders[i] ); } } - LoadShaderInfo(); + Sys_Printf( "\n\tShaizers....\n" ); + + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + if ( pk3Shaderfiles[i][0] != '\0' ){ + sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } + Sys_Printf( " !FAIL! %s\n", pk3Shaders[i] ); + } + } - /* clean up map name */ - strcpy( source, ExpandArg( argv[i] ) ); - ExtractFileExtension( source, ext ); + Sys_Printf( "\n\tSounds....\n" ); - if ( !map_allowed && !force_map ) { - force_bsp = qtrue; + for ( i = 0; i < pk3SoundsN; i++ ){ + if ( pk3Sounds[i][0] != '\0' ){ + if ( vfsPackFile( pk3Sounds[ i ], packname ) ){ + Sys_Printf( "++%s\n", pk3Sounds[ i ] ); + continue; + } + Sys_Printf( " !FAIL! %s\n", pk3Sounds[i] ); + } } - 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" ); + Sys_Printf( "\n\tVideos....\n" ); + + for ( i = 0; i < pk3VideosN; i++ ){ + if ( vfsPackFile( pk3Videos[i], packname ) ){ + Sys_Printf( "++%s\n", pk3Videos[i] ); + continue; } - StripExtension( source ); - DefaultExtension( source, ".map" ); - Sys_Printf( "Loading %s\n", source ); - LoadMapFile( source, qfalse, convertGame == NULL ); - PseudoCompileBSP( convertGame != NULL ); + Sys_Printf( " !FAIL! %s\n", pk3Videos[i] ); } - else - { - StripExtension( source ); - DefaultExtension( source, ".bsp" ); - Sys_Printf( "Loading %s\n", source ); - LoadBSPFile( source ); - ParseEntities(); + + Sys_Printf( "\n\t.\n" ); + + sprintf( temp, "maps/%s.bsp", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); } - /* bsp format convert? */ - if ( convertGame != NULL ) { - /* set global game */ - game = convertGame; + sprintf( temp, "maps/%s.aas", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); + } - /* write bsp */ - StripExtension( source ); - DefaultExtension( source, "_c.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); + sprintf( temp, "scripts/%s.arena", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); + } - /* return to sender */ - return 0; + sprintf( temp, "scripts/%s.defi", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); } - /* normal convert */ - return convertFunc( source ); + Sys_Printf( "\nSaved to %s\n", packname ); + /* return to sender */ + return 0; } - /* main() q3map mojo... @@ -1892,6 +949,7 @@ int ConvertBSPMain( int argc, char **argv ){ int main( int argc, char **argv ){ int i, r; double start, end; + extern qboolean werror; /* we want consistent 'randomness' */ @@ -1909,6 +967,13 @@ int main( int argc, char **argv ){ /* read general options first */ for ( i = 1; i < argc; i++ ) { + /* -help */ + if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" ) + || !strcmp( argv[ i ], "-help" ) ) { + HelpMain(argv[i+1]); + return 0; + } + /* -connect */ if ( !strcmp( argv[ i ], "-connect" ) ) { argv[ i ] = NULL; @@ -1931,6 +996,12 @@ int main( int argc, char **argv ){ argv[ i ] = NULL; } + /* make all warnings into errors */ + else if ( !strcmp( argv[ i ], "-werror" ) ) { + werror = qtrue; + argv[ i ] = NULL; + } + /* patch subdivisions */ else if ( !strcmp( argv[ i ], "-subdivisions" ) ) { argv[ i ] = NULL; @@ -1949,6 +1020,7 @@ int main( int argc, char **argv ){ numthreads = atoi( argv[ i ] ); argv[ i ] = NULL; } + else if( !strcmp( argv[ i ], "-nocmdline" ) ) { Sys_Printf( "noCmdLine\n" ); @@ -1983,6 +1055,9 @@ int main( int argc, char **argv ){ Sys_Printf( "Q3Map (ydnar) - v" Q3MAP_VERSION "\n" ); Sys_Printf( "NetRadiant - v" RADIANT_VERSION " " __DATE__ " " __TIME__ "\n" ); Sys_Printf( "%s\n", Q3MAP_MOTD ); + Sys_Printf( "%s\n", argv[0] ); + + strcpy( q3map2path, argv[0] );//fuer autoPack func /* ydnar: new path initialization */ InitPaths( &argc, argv ); @@ -1999,17 +1074,17 @@ int main( int argc, char **argv ){ /* fixaas */ if ( !strcmp( argv[ 1 ], "-fixaas" ) ) { - r = FixAAS( argc - 1, argv + 1 ); + r = FixAASMain( argc - 1, argv + 1 ); } /* analyze */ else if ( !strcmp( argv[ 1 ], "-analyze" ) ) { - r = AnalyzeBSP( argc - 1, argv + 1 ); + r = AnalyzeBSPMain( argc - 1, argv + 1 ); } /* info */ else if ( !strcmp( argv[ 1 ], "-info" ) ) { - r = BSPInfo( argc - 2, argv + 2 ); + r = BSPInfoMain( argc - 2, argv + 2 ); } /* vis */ @@ -2024,11 +1099,16 @@ int main( int argc, char **argv ){ /* vlight */ else if ( !strcmp( argv[ 1 ], "-vlight" ) ) { - Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); + Sys_FPrintf( SYS_WRN, "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); argv[ 1 ] = "-fast"; /* eek a hack */ r = LightMain( argc, argv ); } + /* QBall: export entities */ + else if ( !strcmp( argv[ 1 ], "-exportents" ) ) { + r = ExportEntitiesMain( argc - 1, argv + 1 ); + } + /* ydnar: lightmap export */ else if ( !strcmp( argv[ 1 ], "-export" ) ) { r = ExportLightmapsMain( argc - 1, argv + 1 ); @@ -2049,6 +1129,11 @@ int main( int argc, char **argv ){ r = ShiftBSPMain( argc - 1, argv + 1 ); } + /* autopacking */ + else if ( !strcmp( argv[ 1 ], "-pk3" ) ) { + r = pk3BSPMain( argc - 1, argv + 1 ); + } + /* ydnar: bsp conversion */ else if ( !strcmp( argv[ 1 ], "-convert" ) ) { r = ConvertBSPMain( argc - 1, argv + 1 );