X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmain.c;h=75bc4608703040218db568b49aceaa85eaf70162;hb=11c140ba5e462d14fc1708c60e099746d4c1fded;hp=73c92c608692e2a843e6c57c1b212847035ffa60;hpb=0a615ccf4f63c7551d54026ce231163a69df9f5f;p=xonotic%2Fnetradiant.git diff --git a/tools/quake3/q3map2/main.c b/tools/quake3/q3map2/main.c index 73c92c60..75bc4608 100644 --- a/tools/quake3/q3map2/main.c +++ b/tools/quake3/q3map2/main.c @@ -1,30 +1,30 @@ /* ------------------------------------------------------------------------------- -Copyright (C) 1999-2007 id Software, Inc. and contributors. -For a list of contributors, see the accompanying CONTRIBUTORS file. + Copyright (C) 1999-2007 id Software, Inc. and contributors. + For a list of contributors, see the accompanying CONTRIBUTORS file. -This file is part of GtkRadiant. + This file is part of GtkRadiant. -GtkRadiant is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. + GtkRadiant is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -GtkRadiant is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GtkRadiant is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with GtkRadiant; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License + along with GtkRadiant; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -------------------------------------------------------------------------------- + ------------------------------------------------------------------------------- -This code has been altered significantly from its original form, to support -several games based on the Quake III Arena engine, in the form of "Q3Map2." + This code has been altered significantly from its original form, to support + several games based on the Quake III Arena engine, in the form of "Q3Map2." -------------------------------------------------------------------------------- */ + ------------------------------------------------------------------------------- */ @@ -35,1312 +35,1001 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2." /* dependencies */ #include "q3map2.h" - - +#include /* -Random() -returns a pseudorandom number between 0 and 1 -*/ + Random() + returns a pseudorandom number between 0 and 1 + */ -vec_t Random( void ) -{ +vec_t Random( void ){ return (vec_t) rand() / RAND_MAX; } +char *Q_strncpyz( char *dst, const char *src, size_t len ) { + if ( len == 0 ) { + abort(); + } + + strncpy( dst, src, len ); + dst[ len - 1 ] = '\0'; + return dst; +} + + +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 -*/ + ExitQ3Map() + cleanup routine + */ -static void ExitQ3Map( void ) -{ +static void ExitQ3Map( void ){ BSPFilesCleanup(); - if( mapDrawSurfs != NULL ) + if ( mapDrawSurfs != NULL ) { free( mapDrawSurfs ); + } } +/* + ShiftBSPMain() + shifts a map: for testing physics with huge coordinates + */ -/* minimap stuff */ +int ShiftBSPMain( 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; -/* borrowed from light.c */ -void WriteTGA24( char *filename, byte *data, int width, int height, qboolean flip ); -typedef struct minimap_s -{ - bspModel_t *model; - int width; - int height; - int samples; - float *sample_offsets; - float sharpen_boxmult; - float sharpen_centermult; - float *data1f; - float *sharpendata1f; - vec3_t mins, size; -} -minimap_t; -static minimap_t minimap; -qboolean BrushIntersectionWithLine(bspBrush_t *brush, vec3_t start, vec3_t dir, float *t_in, float *t_out) -{ - int i; - qboolean in = qfalse, out = qfalse; - bspBrushSide_t *sides = &bspBrushSides[brush->firstSide]; + /* arg checking */ + if ( argc < 3 ) { + Sys_Printf( "Usage: q3map [-v] -shift [-tex] [-spawn_ref ] \n" ); + return 0; + } - for(i = 0; i < brush->numSides; ++i) + texscale = qfalse; + for ( i = 1; i < argc - 2; ++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! + if ( !strcmp( argv[i], "-tex" ) ) { + texscale = qtrue; } - 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; - } - } + else if ( !strcmp( argv[i], "-spawn_ref" ) ) { + spawn_ref = atof( argv[i + 1] ); + ++i; + } + else{ + break; } } - return in && out; -} - -static float MiniMapSample(float x, float y) -{ - vec3_t org, dir; - int i, bi; - float t0, t1; - float samp; - bspBrush_t *b; - int cnt; - - org[0] = x; - org[1] = y; - org[2] = 0; - dir[0] = 0; - dir[1] = 0; - dir[2] = 1; - - cnt = 0; - samp = 0; - for(i = 0; i < minimap.model->numBSPBrushes; ++i) - { - bi = minimap.model->firstBSPBrush + i; - if(opaqueBrushes[bi >> 3] & (1 << (bi & 7))) - { - b = &bspBrushes[bi]; - - // sort out mins/maxs of the brush - bspBrushSide_t *s = &bspBrushSides[b->firstSide]; - if(x < -bspPlanes[s[0].planeNum].dist) - continue; - if(x > +bspPlanes[s[1].planeNum].dist) - continue; - if(y < -bspPlanes[s[2].planeNum].dist) - continue; - if(y > +bspPlanes[s[3].planeNum].dist) - continue; - if(BrushIntersectionWithLine(b, org, dir, &t0, &t1)) - { - samp += t1 - t0; - ++cnt; - } - } + /* get shift */ + // 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 ] ); } - return samp; -} + uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) ); -static void MiniMapRandomlySupersampled(int y) -{ - int x, i; - float *p = &minimap.data1f[y * minimap.width]; - float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height); - float dx = minimap.size[0] / (float) minimap.width; - float dy = minimap.size[1] / (float) minimap.height; - for(x = 0; x < minimap.width; ++x) - { - float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width); - float val = 0; + /* do some path mangling */ + strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); + StripExtension( source ); + DefaultExtension( source, ".bsp" ); - for(i = 0; i < minimap.samples; ++i) - { - float thisval = MiniMapSample( - xmin + (2 * Random() - 0.5) * dx, /* exaggerated random pattern for better results */ - ymin + (2 * Random() - 0.5) * dy /* exaggerated random pattern for better results */ - ); - val += thisval; - } - val /= minimap.samples * minimap.size[2]; - *p++ = val; - } -} + /* load the bsp */ + Sys_Printf( "Loading %s\n", source ); + LoadBSPFile( source ); + ParseEntities(); -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; + /* note it */ + Sys_Printf( "--- ShiftBSP ---\n" ); + Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities ); - for(x = 0; x < minimap.width; ++x) + /* shift entity keys */ + for ( i = 0; i < numBSPEntities && i < numEntities; i++ ) { - 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; + /* shift 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 ); } - val /= minimap.samples * minimap.size[2]; - *p++ = val; - } -} -static void MiniMapNoSupersampling(int y) -{ - int x; - float *p = &minimap.data1f[y * minimap.width]; - float ymin = minimap.mins[1] + minimap.size[1] * (y / (float) minimap.height); + } - for(x = 0; x < minimap.width; ++x) + /* shift models */ + for ( i = 0; i < numBSPModels; i++ ) { - float xmin = minimap.mins[0] + minimap.size[0] * (x / (float) minimap.width); - *p++ = MiniMapSample(xmin, ymin) / minimap.size[2]; + 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]; } -} -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]; + /* shift 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]; + } - for(x = 0; x < minimap.width; ++x) + /* shift leafs */ + for ( i = 0; i < numBSPLeafs; i++ ) { - 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; + 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]; } -} -void MiniMapMakeMinsMaxs() -{ - vec3_t mins, maxs, extend; - VectorCopy(minimap.model->mins, mins); - VectorCopy(minimap.model->maxs, maxs); + /* shift 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]; + } - // 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]); + /* shift planes */ - VectorSubtract(maxs, mins, extend); + vec3_t point; - if(extend[1] > extend[0]) + for ( i = 0; i < numBSPPlanes; i++ ) { - mins[0] -= (extend[1] - extend[0]) * 0.5; - maxs[0] += (extend[1] - extend[0]) * 0.5; + //find point on plane + for ( j=0; j<3; j++ ){ + if ( fabs( bspPlanes[ i ].normal[j] ) > 0.5 ){ + point[j] = bspPlanes[ i ].dist / bspPlanes[ i ].normal[j]; + point[(j+1)%3] = point[(j+2)%3] = 0; + break; + } + } + //shift point + for ( j=0; j<3; j++ ){ + point[j] += scale[j]; + } + //calc new plane dist + bspPlanes[ i ].dist = DotProduct( point, bspPlanes[ i ].normal ); } - else - { - mins[1] -= (extend[0] - extend[1]) * 0.5; - maxs[1] += (extend[0] - extend[1]) * 0.5; + + /* scale gridsize */ + /* + GetVectorForKey( &entities[ 0 ], "gridsize", vec ); + if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) { + VectorCopy( gridSize, 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 ); + DefaultExtension( source, "_sh.bsp" ); + Sys_Printf( "Writing %s\n", source ); + WriteBSPFile( source ); - VectorSubtract(maxs, mins, extend); - VectorScale(extend, 1.0 / 64.0, extend); + /* return to sender */ + return 0; +} - VectorSubtract(mins, extend, mins); - VectorAdd(maxs, extend, maxs); - VectorCopy(mins, minimap.mins); - VectorSubtract(maxs, mins, minimap.size); +void FixDOSName( char *src ){ + if ( src == NULL ) { + return; + } - // 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]); + while ( *src ) + { + if ( *src == '\\' ) { + *src = '/'; + } + src++; + } } /* -MiniMapSetupBrushes() -determines solid non-sky brushes in the world + 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; +} -void MiniMapSetupBrushes( void ) -{ - int i, j, b, compileFlags; - bspBrush_t *brush; - bspBrushSide_t *side; - bspShader_t *shader; - shaderInfo_t *si; - - - /* note it */ - Sys_FPrintf( SYS_VRB, "--- MiniMapSetupBrushes ---\n" ); - - /* allocate */ - if( opaqueBrushes == NULL ) - opaqueBrushes = safe_malloc( numBSPBrushes / 8 + 1 ); - - /* clear */ - memset( opaqueBrushes, 0, numBSPBrushes / 8 + 1 ); - numOpaqueBrushes = 0; - - /* walk the list of worldspawn brushes */ - for( i = 0; i < minimap.model->numBSPBrushes; i++ ) + +/* + 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 brush */ - b = minimap.model->firstBSPBrush + i; - brush = &bspBrushes[ b ]; - -#if 0 - /* check all sides */ - compileFlags = 0; - for( j = 0; j < brush->numSides; j++ ) - { - /* do bsp shader calculations */ - side = &bspBrushSides[ brush->firstSide + j ]; - shader = &bspShaders[ side->shaderNum ]; - - /* get shader info */ - si = ShaderInfoForShader( shader->shader ); - if( si == NULL ) - continue; - - /* or together compile flags */ - compileFlags |= si->compileFlags; + if ( !GetToken( qtrue ) ) { + break; } -#else - shader = &bspShaders[ brush->shaderNum ]; - si = ShaderInfoForShader( shader->shader ); - if( si == NULL ) - compileFlags = 0; - else - compileFlags = si->compileFlags; -#endif - - /* determine if this brush is solid */ - if( (compileFlags & (C_SOLID | C_SKY)) == C_SOLID ) - { - opaqueBrushes[ b >> 3 ] |= (1 << (b & 7)); - numOpaqueBrushes++; - maxOpaqueBrush = i; + if ( !strcmp( token, "}" ) ) { + break; } + if ( token[0] == '{' ) { + Error( "ReadExclusionsFile: %s, line %d: brace, opening twice in a row.", exName, scriptline ); + } + + /* add to list */ + strcpy( data[*num], token ); + (*num)++; } - - /* emit some statistics */ - Sys_FPrintf( SYS_VRB, "%9d solid brushes\n", numOpaqueBrushes ); + return; } -int MiniMapBSPMain( int argc, char **argv ) -{ - char minimapFilename[1024]; - char basename[1024]; - char path[1024]; - char parentpath[1024]; - float minimapSharpen; - byte *data3b, *p; - float *q; - int x, y; - int i; +char q3map2path[1024]; +/* + pk3BSPMain() + map autopackager, works for Q3 type of shaders and ents + */ - /* 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; +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; + } } - /* load the BSP first */ + + + /* do some path mangling */ strcpy( source, ExpandArg( argv[ argc - 1 ] ) ); StripExtension( source ); DefaultExtension( source, ".bsp" ); + + /* load the bsp */ Sys_Printf( "Loading %s\n", source ); - BeginMapShaderFile( source ); - LoadShaderInfo(); LoadBSPFile( source ); + ParseEntities(); - minimap.model = &bspModels[0]; - MiniMapMakeMinsMaxs(); - *minimapFilename = 0; - minimapSharpen = 1; - minimap.width = minimap.height = 512; - minimap.samples = 1; - minimap.sample_offsets = NULL; + char packname[ 1024 ], base[ 1024 ], nameOFmap[ 1024 ]; + int len; + strcpy( packname, EnginePath ); - /* process arguments */ - for( i = 1; i < (argc - 1); i++ ) - { - if( !strcmp( argv[ i ], "-size" ) ) - { - minimap.width = minimap.height = atoi(argv[i + 1]); - i++; - Sys_Printf( "Image size set to %i\n", minimap.width ); - } - else if( !strcmp( argv[ i ], "-sharpen" ) ) - { - minimapSharpen = atof(argv[i + 1]); - i++; - Sys_Printf( "Sharpening coefficient set to %f\n", minimapSharpen ); - } - else if( !strcmp( argv[ i ], "-samples" ) ) - { - minimap.samples = atoi(argv[i + 1]); - i++; - Sys_Printf( "Samples set to %i\n", minimap.samples ); - if(minimap.sample_offsets) - free(minimap.sample_offsets); - minimap.sample_offsets = malloc(2 * sizeof(*minimap.sample_offsets) * minimap.samples); - /* TODO use a better pattern */ - for(x = 0; x < 2 * minimap.samples; ++x) - minimap.sample_offsets[x] = Random(); - } - else if( !strcmp( argv[ i ], "-random" ) ) - { - minimap.samples = atoi(argv[i + 1]); - i++; - Sys_Printf( "Random samples set to %i\n", minimap.samples ); - if(minimap.sample_offsets) - free(minimap.sample_offsets); - minimap.sample_offsets = NULL; - } - else if( !strcmp( argv[ i ], "-o" ) ) - { - strcpy(minimapFilename, argv[i + 1]); - i++; - Sys_Printf( "Output file name set to %s\n", minimapFilename ); - } - else if( !strcmp( argv[ i ], "-minmax" ) && i < (argc - 7) ) - { - minimap.mins[0] = atof(argv[i + 1]); - minimap.mins[1] = atof(argv[i + 2]); - minimap.mins[2] = atof(argv[i + 3]); - minimap.size[0] = atof(argv[i + 4]) - minimap.mins[0]; - minimap.size[1] = atof(argv[i + 5]) - minimap.mins[1]; - minimap.size[2] = atof(argv[i + 6]) - minimap.mins[2]; - i += 6; - Sys_Printf( "Map mins/maxs overridden\n" ); - } - } - - if(!*minimapFilename) - { - ExtractFileBase(source, basename); - ExtractFilePath(source, path); - if(*path) - path[strlen(path)-1] = 0; - ExtractFilePath(path, parentpath); - sprintf(minimapFilename, "%sgfx", parentpath); - Q_mkdir(minimapFilename); - sprintf(minimapFilename, "%sgfx/%s_mini.tga", parentpath, basename); - Sys_Printf("Output file name automatically set to %s\n", minimapFilename); - } - - if(minimapSharpen >= 0) - { - minimap.sharpen_centermult = 8 * minimapSharpen + 1; - minimap.sharpen_boxmult = -minimapSharpen; - } - minimap.data1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f)); - data3b = safe_malloc(minimap.width * minimap.height * 3); - if(minimapSharpen >= 0) - minimap.sharpendata1f = safe_malloc(minimap.width * minimap.height * sizeof(*minimap.data1f)); + /* copy map name */ + strcpy( base, source ); + StripExtension( base ); - MiniMapSetupBrushes(); + /* extract map name */ + len = strlen( base ) - 1; + while ( len > 0 && base[ len ] != '/' && base[ len ] != '\\' ) + len--; + strcpy( nameOFmap, &base[ len + 1 ] ); - if(minimap.samples <= 1) - { - Sys_Printf( "\n--- MiniMapNoSupersampling (%d) ---\n", minimap.height ); - RunThreadsOnIndividual(minimap.height, qtrue, MiniMapNoSupersampling); + + 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 ); } - 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); + + 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 ); } } - if(minimap.sharpendata1f) - { - Sys_Printf( "\n--- MiniMapSharpen (%d) ---\n", minimap.height ); - RunThreadsOnIndividual(minimap.height, qtrue, MiniMapSharpen); - q = minimap.sharpendata1f; - } - else + //ent keys + epair_t *ep; + for ( ep = entities[0].epairs; ep != NULL; ep = ep->next ) { - q = minimap.data1f; + 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 ); - Sys_Printf( "\nConverting..."); - p = data3b; - for(y = 0; y < minimap.height; ++y) - for(x = 0; x < minimap.width; ++x) - { - byte b; - float v = *q++; - if(v < 0) v = 0; - if(v > 255.0/256.0) v = 255.0/256.0; - b = v * 256; - *p++ = b; - *p++ = b; - *p++ = b; + 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 ); + } - Sys_Printf( " writing to %s...", minimapFilename ); - WriteTGA24(minimapFilename, data3b, minimap.width, minimap.height, qfalse); + //levelshot + sprintf( pk3Shaders[ pk3ShadersN ], "levelshots/%s", nameOFmap ); + res2list( pk3Shaders, &pk3ShadersN ); - Sys_Printf( " done.\n" ); - /* return to sender */ - return 0; -} + if( dbg ){ + Sys_Printf( "\tDrawsurface+ent calls....%i\n", pk3ShadersN ); + for ( i = 0; i < pk3ShadersN; i++ ){ + Sys_Printf( "%s\n", pk3Shaders[i] ); + } + Sys_Printf( "\tSounds....%i\n", pk3SoundsN ); + for ( i = 0; i < pk3SoundsN; i++ ){ + Sys_Printf( "%s\n", pk3Sounds[i] ); + } + } + vfsListShaderFiles( pk3Shaderfiles, &pk3ShaderfilesN ); + if( dbg ){ + Sys_Printf( "\tSchroider fileses.....%i\n", pk3ShaderfilesN ); + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + Sys_Printf( "%s\n", pk3Shaderfiles[i] ); + } + } + /* 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; + + 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" ); + + 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; + } -/* -MD4BlockChecksum() -calculates an md4 checksum for a block of data -*/ + /* parse the file */ + ParseFromMemory( (char *) buffer, size ); -static int MD4BlockChecksum( void *buffer, int length ) -{ - return Com_BlockChecksum(buffer, length); -} + /* blocks pointers */ + //int *exptrN; + //char *exptr[512][64]; -/* -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 ) + /* tokenize it */ + while ( 1 ) { - Sys_Printf( "Usage: q3map -fixaas [-v] \n" ); - return 0; + /* 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 ); + } } - - /* 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 ); + + /* 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] ); } - - /* return to sender */ - return 0; -} + char temp[ 1024 ]; + //Parse Shader Files + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + qboolean wantShader = qfalse; + qboolean wantShaderFile = qfalse; + char shadername[ 1024 ]; + char lastwantedShader[ 1024 ]; -/* -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; + /* load the shader */ + sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] ); + LoadScriptFile( temp, 0 ); -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 ) + /* tokenize it */ + while ( 1 ) { - 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, (length < 1024 ? length : 1024) ); - lumpString[ 1024 ] = '\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 + /* test for end of file */ + if ( !GetToken( qtrue ) ) { + break; + } + //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; + } + } + + /* handle { } section */ + if ( !GetToken( qtrue ) ) { + break; + } + if ( strcmp( token, "{" ) ) { + Error( "ParseShaderFile: %s, line %d: { not found!\nFound instead: %s", + temp, scriptline, token ); + } + + while ( 1 ) { - /* 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 ); + /* 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 ); } } } - - 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; -} + //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 { + pk3Shaderfiles[ i ][0] = '\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 ); +/* 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; + } + } } - 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; -} + } +//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; + } + } + } -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; + if( dbg ){ + Sys_Printf( "\tShader referenced textures....%i\n", pk3TexturesN ); + for ( i = 0; i < pk3TexturesN; i++ ){ + Sys_Printf( "%s\n", pk3Textures[i] ); + } + Sys_Printf( "\tShader files....\n" ); + for ( i = 0; i < pk3ShaderfilesN; i++ ){ + if ( pk3Shaderfiles[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaderfiles[i] ); + } + Sys_Printf( "\tPure textures....\n" ); + for ( i = 0; i < pk3ShadersN; i++ ){ + if ( pk3Shaders[i][0] != '\0' ) Sys_Printf( "%s\n", pk3Shaders[i] ); + } } - 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; - - - /* arg checking */ - if( argc < 3 ) - { - Sys_Printf( "Usage: q3map [-v] -scale [-tex] \n" ); - return 0; - } - - /* get scale */ - scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] ); - if(argc >= 4) - scale[1] = scale[0] = atof( argv[ argc - 3 ] ); - if(argc >= 5) - scale[0] = atof( argv[ argc - 4 ] ); + sprintf( packname, "%s/%s_autopacked.pk3", EnginePath, nameOFmap ); + remove( packname ); - texscale = !strcmp(argv[1], "-tex"); - - uniform = ((scale[0] == scale[1]) && (scale[1] == scale[2])); + Sys_Printf( "--- ZipZip ---\n" ); - if( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f ) - { - Sys_Printf( "Usage: q3map [-v] -scale [-tex] \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 ]) ) - { - 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[ i ], "origin", str ); + 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; + } + } + sprintf( temp, "%s.tga", pk3Textures[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; + } + sprintf( temp, "%s.jpg", pk3Textures[i] ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); + continue; } + Sys_Printf( " !FAIL! %s\n", pk3Textures[i] ); + } - 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 ); + 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] ); } - - /* scale plat height */ - f = FloatForKey( &entities[ i ], "height" ); - if( f ) - { - f *= scale[2]; - sprintf( str, "%f", f ); - SetKeyValue( &entities[ i ], "height", str ); + } + + 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] ); } + } - // TODO maybe allow a definition file for entities to specify which values are scaled how? + Sys_Printf( "\n\tSounds....\n" ); + + 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] ); + } } - - /* 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]; + + Sys_Printf( "\n\tVideos....\n" ); + + for ( i = 0; i < pk3VideosN; i++ ){ + if ( vfsPackFile( pk3Videos[i], packname ) ){ + Sys_Printf( "++%s\n", pk3Videos[i] ); + continue; } + Sys_Printf( " !FAIL! %s\n", pk3Videos[i] ); } - /* 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); + 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 ); } - 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; - } + sprintf( temp, "maps/%s.aas", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); } - - /* scale planes */ - if(uniform) - { - for( i = 0; i < numBSPPlanes; i++ ) - { - bspPlanes[ i ].dist *= scale[0]; + + sprintf( temp, "scripts/%s.arena", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); } - 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; + + sprintf( temp, "scripts/%s.defi", nameOFmap ); + if ( vfsPackFile( temp, packname ) ){ + Sys_Printf( "++%s\n", temp ); } + else{ + Sys_Printf( " !FAIL! %s\n", temp ); } - - /* scale gridsize */ - GetVectorForKey( &entities[ 0 ], "gridsize", vec ); - if( (vec[ 0 ] + vec[ 1 ] + vec[ 2 ]) == 0.0f ) - VectorCopy( gridSize, 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 ); - DefaultExtension( source, "_s.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); - + Sys_Printf( "\nSaved to %s\n", packname ); /* return to sender */ return 0; } - /* -ConvertBSPMain() -main argument processing function for bsp conversion -*/ - -int ConvertBSPMain( int argc, char **argv ) -{ - int i; - int (*convertFunc)( char * ); - game_t *convertGame; - - - /* set default */ - convertFunc = ConvertBSPToASE; - convertGame = NULL; - - /* arg checking */ - if( argc < 1 ) - { - Sys_Printf( "Usage: q3map -scale [-v] \n" ); - return 0; - } - - /* process arguments */ - for( i = 1; i < (argc - 1); i++ ) - { - /* -format map|ase|... */ - if( !strcmp( argv[ i ], "-format" ) ) - { - i++; - if( !Q_stricmp( argv[ i ], "ase" ) ) - convertFunc = ConvertBSPToASE; - else if( !Q_stricmp( argv[ i ], "map" ) ) - convertFunc = ConvertBSPToMap; - else - { - convertGame = GetGame( argv[ i ] ); - 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 ], "-shadersasbitmap" ) ) - shadersAsBitmap = 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 ); - - LoadBSPFile( source ); - - /* parse bsp entities */ - ParseEntities(); - - /* bsp format convert? */ - if( convertGame != NULL ) - { - /* set global game */ - game = convertGame; - - /* write bsp */ - StripExtension( source ); - DefaultExtension( source, "_c.bsp" ); - Sys_Printf( "Writing %s\n", source ); - WriteBSPFile( source ); - - /* return to sender */ - return 0; - } - - /* normal convert */ - return convertFunc( source ); -} + main() + q3map mojo... + */ +int main( int argc, char **argv ){ + int i, r; + double start, end; + extern qboolean werror; -/* -main() -q3map mojo... -*/ - -int main( int argc, char **argv ) -{ - int i, r; - double start, end; - - /* we want consistent 'randomness' */ srand( 0 ); - + /* start timer */ start = I_FloatTime(); /* this was changed to emit version number over the network */ printf( Q3MAP_VERSION "\n" ); - + /* set exit call */ atexit( ExitQ3Map ); /* read general options first */ - for( i = 1; i < argc; i++ ) + 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" ) ) - { + if ( !strcmp( argv[ i ], "-connect" ) ) { argv[ i ] = NULL; i++; Broadcast_Setup( argv[ i ] ); argv[ i ] = NULL; } - + /* verbose */ - else if( !strcmp( argv[ i ], "-v" ) ) - { - if(!verbose) - { + else if ( !strcmp( argv[ i ], "-v" ) ) { + if ( !verbose ) { verbose = qtrue; argv[ i ] = NULL; } } - + /* force */ - else if( !strcmp( argv[ i ], "-force" ) ) - { + else if ( !strcmp( argv[ i ], "-force" ) ) { force = qtrue; 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" ) ) - { + else if ( !strcmp( argv[ i ], "-subdivisions" ) ) { argv[ i ] = NULL; i++; patchSubdivisions = atoi( argv[ i ] ); argv[ i ] = NULL; - if( patchSubdivisions <= 0 ) + if ( patchSubdivisions <= 0 ) { patchSubdivisions = 1; + } } - + /* threads */ - else if( !strcmp( argv[ i ], "-threads" ) ) - { + else if ( !strcmp( argv[ i ], "-threads" ) ) { argv[ i ] = NULL; i++; numthreads = atoi( argv[ i ] ); argv[ i ] = NULL; } + + else if( !strcmp( argv[ i ], "-nocmdline" ) ) + { + Sys_Printf( "noCmdLine\n" ); + nocmdline = qtrue; + argv[ i ] = NULL; + } + } - + /* init model library */ PicoInit(); PicoSetMallocFunc( safe_malloc ); @@ -1348,95 +1037,125 @@ int main( int argc, char **argv ) PicoSetPrintFunc( PicoPrintFunc ); PicoSetLoadFileFunc( PicoLoadFileFunc ); PicoSetFreeFileFunc( free ); - + /* set number of threads */ ThreadSetDefault(); - + /* generate sinusoid jitter table */ - for( i = 0; i < MAX_JITTERS; i++ ) + for ( i = 0; i < MAX_JITTERS; i++ ) { jitters[ i ] = sin( i * 139.54152147 ); //% Sys_Printf( "Jitter %4d: %f\n", i, jitters[ i ] ); } - + /* we print out two versions, q3map's main version (since it evolves a bit out of GtkRadiant) and we put the GtkRadiant version to make it easy to track with what version of Radiant it was built with */ - + Sys_Printf( "Q3Map - v1.0r (c) 1999 Id Software Inc.\n" ); 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 ); /* set game options */ - if (!patchSubdivisions) + if ( !patchSubdivisions ) { patchSubdivisions = game->patchSubdivisions; - + } + /* check if we have enough options left to attempt something */ - if( argc < 2 ) + if ( argc < 2 ) { Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] ); - + } + /* fixaas */ - if( !strcmp( argv[ 1 ], "-fixaas" ) ) - r = FixAAS( argc - 1, argv + 1 ); - + if ( !strcmp( argv[ 1 ], "-fixaas" ) ) { + r = FixAASMain( argc - 1, argv + 1 ); + } + /* analyze */ - else if( !strcmp( argv[ 1 ], "-analyze" ) ) - r = AnalyzeBSP( argc - 1, argv + 1 ); - + else if ( !strcmp( argv[ 1 ], "-analyze" ) ) { + r = AnalyzeBSPMain( argc - 1, argv + 1 ); + } + /* info */ - else if( !strcmp( argv[ 1 ], "-info" ) ) - r = BSPInfo( argc - 2, argv + 2 ); - + else if ( !strcmp( argv[ 1 ], "-info" ) ) { + r = BSPInfoMain( argc - 2, argv + 2 ); + } + /* vis */ - else if( !strcmp( argv[ 1 ], "-vis" ) ) + else if ( !strcmp( argv[ 1 ], "-vis" ) ) { r = VisMain( argc - 1, argv + 1 ); - + } + /* light */ - else if( !strcmp( argv[ 1 ], "-light" ) ) + else if ( !strcmp( argv[ 1 ], "-light" ) ) { r = LightMain( argc - 1, argv + 1 ); - + } + /* vlight */ - else if( !strcmp( argv[ 1 ], "-vlight" ) ) - { - Sys_Printf( "WARNING: VLight is no longer supported, defaulting to -light -fast instead\n\n" ); - argv[ 1 ] = "-fast"; /* eek a hack */ + else if ( !strcmp( argv[ 1 ], "-vlight" ) ) { + 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" ) ) + else if ( !strcmp( argv[ 1 ], "-export" ) ) { r = ExportLightmapsMain( argc - 1, argv + 1 ); - + } + /* ydnar: lightmap import */ - else if( !strcmp( argv[ 1 ], "-import" ) ) + else if ( !strcmp( argv[ 1 ], "-import" ) ) { r = ImportLightmapsMain( argc - 1, argv + 1 ); - + } + /* ydnar: bsp scaling */ - else if( !strcmp( argv[ 1 ], "-scale" ) ) + else if ( !strcmp( argv[ 1 ], "-scale" ) ) { r = ScaleBSPMain( argc - 1, argv + 1 ); - + } + + /* bsp shifting */ + else if ( !strcmp( argv[ 1 ], "-shift" ) ) { + 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" ) ) + else if ( !strcmp( argv[ 1 ], "-convert" ) ) { r = ConvertBSPMain( argc - 1, argv + 1 ); - + } + /* div0: minimap */ - else if( !strcmp( argv[ 1 ], "-minimap" ) ) - r = MiniMapBSPMain(argc - 1, argv + 1); + else if ( !strcmp( argv[ 1 ], "-minimap" ) ) { + r = MiniMapBSPMain( argc - 1, argv + 1 ); + } /* ydnar: otherwise create a bsp */ - else + else{ r = BSPMain( argc, argv ); - + } + /* emit time */ end = I_FloatTime(); Sys_Printf( "%9.0f seconds elapsed\n", end - start ); - + /* shut down connection */ Broadcast_Shutdown(); - + /* return any error code */ return r; }