/* dependencies */
#include "q3map2.h"
-
-
+#include <glib.h>
/*
Random()
char *Q_strcat( char *dst, size_t dlen, const char *src ) {
- size_t n = strlen( dst );
+ size_t n = strlen( dst );
if ( n > dlen ) {
abort(); /* buffer overflow */
return Q_strncpyz( dst + n, src, MIN( slen, dlen - n ) );
}
+
/*
ExitQ3Map()
cleanup routine
}
}
-/*
- 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] <mapname>\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
+ ShiftBSPMain()
+ shifts a map: for testing physics with huge coordinates
*/
-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] <mapname>\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 ShiftBSPMain( int argc, char **argv ){
int i, j;
float f, a;
vec3_t scale;
/* arg checking */
if ( argc < 3 ) {
- Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
+ Sys_Printf( "Usage: q3map [-v] -shift [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
return 0;
}
}
}
- /* get scale */
+ /* get shift */
// if(argc-2 >= i) // always true
scale[2] = scale[1] = scale[0] = atof( argv[ argc - 2 ] );
if ( argc - 3 >= i ) {
uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) );
- if ( scale[0] == 0.0f || scale[1] == 0.0f || scale[2] == 0.0f ) {
- Sys_Printf( "Usage: q3map [-v] -scale [-tex] [-spawn_ref <value>] <value> <mapname>\n" );
- Sys_Printf( "Non-zero scale value required.\n" );
- return 0;
- }
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
ParseEntities();
/* note it */
- Sys_Printf( "--- ScaleBSP ---\n" );
+ Sys_Printf( "--- ShiftBSP ---\n" );
Sys_FPrintf( SYS_VRB, "%9d entities\n", numEntities );
- /* scale entity keys */
+ /* shift entity keys */
for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
{
- /* scale origin */
+ /* 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];
+ 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;
}
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 */
+ /* shift 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];
+ 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 */
+ /* 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];
+ 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 */
+ /* shift 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];
- }
+ 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];
}
- /* scale drawverts */
+ /* 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];
- 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 );
+ bspDrawVerts[i].xyz[0] += scale[0];
+ bspDrawVerts[i].xyz[1] += scale[1];
+ bspDrawVerts[i].xyz[2] += scale[2];
}
- 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 );
- }
+ /* shift planes */
+
+ vec3_t point;
+
+ for ( i = 0; i < numBSPPlanes; i++ )
+ {
+ //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;
}
}
- }
-
- /* 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;
+ //shift point
+ for ( j=0; j<3; j++ ){
+ point[j] += scale[j];
}
+ //calc new plane dist
+ bspPlanes[ i ].dist = DotProduct( point, bspPlanes[ i ].normal );
}
/* scale gridsize */
+ /*
GetVectorForKey( &entities[ 0 ], "gridsize", vec );
if ( ( vec[ 0 ] + vec[ 1 ] + vec[ 2 ] ) == 0.0f ) {
VectorCopy( gridSize, vec );
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" );
+ DefaultExtension( source, "_sh.bsp" );
Sys_Printf( "Writing %s\n", source );
WriteBSPFile( source );
}
+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 ( mapEntityNum != 0 ) {
- sprintf( modelValue, "*%d", models++ );
- SetKeyValue( entity, "model", modelValue );
+ if ( !strcmp( token, "}" ) ) {
+ break;
+ }
+ if ( token[0] == '{' ) {
+ Error( "ReadExclusionsFile: %s, line %d: brace, opening twice in a row.", exName, scriptline );
}
- /* process the model */
- Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
- BeginModel();
+ /* add to list */
+ strcpy( data[*num], token );
+ (*num)++;
+ }
+ return;
+}
- entity->firstDrawSurf = numMapDrawSurfs;
+char q3map2path[1024];
+/*
+ pk3BSPMain()
+ map autopackager, works for Q3 type of shaders and ents
+ */
- ClearMetaTriangles();
- PatchMapDrawSurfs( entity );
+int pk3BSPMain( int argc, char **argv ){
+ int i, j;
+ qboolean dbg = qfalse, png = qfalse;
- if ( mapEntityNum == 0 && need_tree ) {
- faces = MakeStructuralBSPFaceList( entities[0].brushes );
- tree = FaceBSP( faces );
- node = tree->headnode;
+ /* process arguments */
+ for ( i = 1; i < ( argc - 1 ); i++ ){
+ if ( !strcmp( argv[ i ], "-dbg" ) ) {
+ dbg = qtrue;
}
- else
- {
- node = AllocNode();
- node->planenum = PLANENUM_LEAF;
- tree = AllocTree();
- tree->headnode = node;
+ else if ( !strcmp( argv[ i ], "-png" ) ) {
+ png = qtrue;
}
+ }
- /* a minimized ClipSidesIntoTree */
- for ( brush = entity->brushes; brush; brush = brush->next )
- {
- /* walk the brush sides */
- for ( i = 0; i < brush->numsides; i++ )
- {
- /* get side */
- side = &brush->sides[ i ];
- if ( side->winding == NULL ) {
- continue;
- }
- /* shader? */
- if ( side->shaderInfo == NULL ) {
- continue;
- }
- /* save this winding as a visible surface */
- DrawSurfaceForSide( entity, brush, side, side->winding );
- }
- }
- if ( meta ) {
- ClassifyEntitySurfaces( entity );
- MakeEntityDecals( entity );
- MakeEntityMetaTriangles( entity );
- SmoothMetaTriangles();
- MergeMetaTriangles();
- }
- FilterDrawsurfsIntoTree( entity, tree );
- FilterStructuralBrushesIntoTree( entity, tree );
- FilterDetailBrushesIntoTree( entity, tree );
+ /* do some path mangling */
+ strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
+ StripExtension( source );
+ DefaultExtension( source, ".bsp" );
- EmitBrushes( entity->brushes, &entity->firstBrush, &entity->numBrushes );
- EndModel( entity, node );
- }
- EndBSPFile( qfalse );
-}
+ /* load the bsp */
+ Sys_Printf( "Loading %s\n", source );
+ LoadBSPFile( source );
+ ParseEntities();
-/*
- 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;
+ char packname[ 1024 ], base[ 1024 ], nameOFmap[ 1024 ];
+ int len;
+ strcpy( packname, EnginePath );
- /* set default */
- convertFunc = ConvertBSPToASE;
- convertGame = NULL;
- map_allowed = qfalse;
- force_bsp = qfalse;
- force_map = qfalse;
+ /* copy map name */
+ strcpy( base, source );
+ StripExtension( base );
- /* arg checking */
- if ( argc < 1 ) {
- Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\n" );
- return 0;
+ /* extract map name */
+ len = strlen( base ) - 1;
+ while ( len > 0 && base[ len ] != '/' && base[ len ] != '\\' )
+ len--;
+ strcpy( nameOFmap, &base[ len + 1 ] );
+
+
+ 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 );
}
- /* process arguments */
- for ( i = 1; i < ( argc - 1 ); i++ )
+ 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 );
+ }
+ }
+
+ //ent keys
+ epair_t *ep;
+ for ( ep = entities[0].epairs; ep != NULL; ep = ep->next )
{
- /* -format map|ase|... */
- if ( !strcmp( argv[ i ], "-format" ) ) {
- i++;
- if ( !Q_stricmp( argv[ i ], "ase" ) ) {
- convertFunc = ConvertBSPToASE;
- map_allowed = qfalse;
- }
- else if ( !Q_stricmp( argv[ i ], "obj" ) ) {
- convertFunc = ConvertBSPToOBJ;
- map_allowed = qfalse;
- }
- else if ( !Q_stricmp( argv[ i ], "map_bp" ) ) {
- convertFunc = ConvertBSPToMap_BP;
- map_allowed = qtrue;
- }
- else if ( !Q_stricmp( argv[ i ], "map" ) ) {
- convertFunc = ConvertBSPToMap;
- map_allowed = qtrue;
- }
- else
- {
- convertGame = GetGame( argv[ i ] );
- map_allowed = qfalse;
- if ( convertGame == NULL ) {
- Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
- }
+ 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 );
+
+ 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 );
}
}
- else if ( !strcmp( argv[ i ], "-ne" ) ) {
- normalEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
+ strcpy( pk3Shaders[pk3ShadersN], ValueForKey( &entities[i], "targetShaderNewName" ) );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
+
+ //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] );
}
- else if ( !strcmp( argv[ i ], "-de" ) ) {
- distanceEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
+ Sys_Printf( "\tSounds....%i\n", pk3SoundsN );
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ Sys_Printf( "%s\n", pk3Sounds[i] );
}
- else if ( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) ) {
- shadersAsBitmap = qtrue;
+ }
+
+ 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;
+ }
+
+ /* parse the file */
+ ParseFromMemory( (char *) buffer, size );
+
+ /* blocks pointers */
+ //int *exptrN;
+ //char *exptr[512][64];
+
+
+ /* tokenize it */
+ while ( 1 )
+ {
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
}
- else if ( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) ) {
- lightmapsAsTexcoord = qtrue;
+
+ /* blocks */
+ if ( !stricmp( token, "textures" ) ){
+ parseEXblock ( EXpk3Textures, &EXpk3TexturesN, exName );
}
- else if ( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !strcmp( argv[ i ], "-deluxemapsastexcoord" ) ) {
- lightmapsAsTexcoord = qtrue;
- deluxemap = qtrue;
+ else if ( !stricmp( token, "shaders" ) ){
+ parseEXblock ( EXpk3Shaders, &EXpk3ShadersN, exName );
}
- else if ( !strcmp( argv[ i ], "-readbsp" ) ) {
- force_bsp = qtrue;
+ else if ( !stricmp( token, "shaderfiles" ) ){
+ parseEXblock ( EXpk3Shaderfiles, &EXpk3ShaderfilesN, exName );
}
- else if ( !strcmp( argv[ i ], "-readmap" ) ) {
- force_map = qtrue;
+ else if ( !stricmp( token, "sounds" ) ){
+ parseEXblock ( EXpk3Sounds, &EXpk3SoundsN, exName );
}
- else if ( !strcmp( argv[ i ], "-meta" ) ) {
- meta = qtrue;
+ else if ( !stricmp( token, "videos" ) ){
+ parseEXblock ( EXpk3Videos, &EXpk3VideosN, exName );
}
- else if ( !strcmp( argv[ i ], "-patchmeta" ) ) {
- meta = qtrue;
- patchMeta = qtrue;
+ else{
+ Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
}
}
- LoadShaderInfo();
+ /* 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] );
+ }
- /* clean up map name */
- strcpy( source, ExpandArg( argv[i] ) );
- ExtractFileExtension( source, ext );
+ char temp[ 1024 ];
- if ( !map_allowed && !force_map ) {
- force_bsp = qtrue;
- }
+ //Parse Shader Files
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ qboolean wantShader = qfalse;
+ qboolean wantShaderFile = qfalse;
+ char shadername[ 1024 ];
+ char lastwantedShader[ 1024 ];
- if ( force_map || ( !force_bsp && !Q_stricmp( ext, "map" ) && map_allowed ) ) {
- if ( !map_allowed ) {
- Sys_Printf( "WARNING: the requested conversion should not be done from .map files. Compile a .bsp first.\n" );
- }
- StripExtension( source );
- DefaultExtension( source, ".map" );
- Sys_Printf( "Loading %s\n", source );
- LoadMapFile( source, qfalse, convertGame == NULL );
- PseudoCompileBSP( convertGame != NULL );
- }
- else
- {
- StripExtension( source );
- DefaultExtension( source, ".bsp" );
- Sys_Printf( "Loading %s\n", source );
- LoadBSPFile( source );
- ParseEntities();
- }
- /* bsp format convert? */
- if ( convertGame != NULL ) {
- /* set global game */
- game = convertGame;
+ /* load the shader */
+ sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles[ i ] );
+ LoadScriptFile( temp, 0 );
- /* write bsp */
- StripExtension( source );
- DefaultExtension( source, "_c.bsp" );
- Sys_Printf( "Writing %s\n", source );
- WriteBSPFile( source );
+ /* tokenize it */
+ while ( 1 )
+ {
+ /* 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 )
+ {
+ /* 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 <outer image> <cloud height> <inner image> */
+ 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 );
+ }
+ }
+ }
+ //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';
+ }
- /* return to sender */
- return 0;
}
- /* normal convert */
- return convertFunc( source );
-}
-struct HelpOption
-{
- const char* name;
- const char* description;
-};
-
-void HelpOptions(const char* group_name, int indentation, int width, struct HelpOption* options, int count)
-{
- indentation *= 2;
- char* indent = malloc(indentation+1);
- memset(indent, ' ', indentation);
- indent[indentation] = 0;
- printf("%s%s:\n", indent, group_name);
- indentation += 2;
- indent = realloc(indent, indentation+1);
- memset(indent, ' ', indentation);
- indent[indentation] = 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;
+ }
+ }
+ }
+ }
- int i;
- for ( i = 0; i < count; i++ )
- {
- int printed = printf("%s%-24s ", indent, options[i].name);
- int descsz = strlen(options[i].description);
- int j = 0;
- while ( j < descsz && descsz-j > width - printed )
- {
- if ( j != 0 )
- printf("%s%26c",indent,' ');
- int fragment = width - printed;
- while ( fragment > 0 && options[i].description[j+fragment-1] != ' ')
- fragment--;
- j += fwrite(options[i].description+j, sizeof(char), fragment, stdout);
- putchar('\n');
- printed = indentation+26;
+//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;
+ }
}
- if ( j == 0 )
- {
- printf("%s\n",options[i].description+j);
+ }
+
+ if( dbg ){
+ Sys_Printf( "\tShader referenced textures....%i\n", pk3TexturesN );
+ for ( i = 0; i < pk3TexturesN; i++ ){
+ Sys_Printf( "%s\n", pk3Textures[i] );
}
- else if ( j < descsz )
- {
- printf("%s%26c%s\n",indent,' ',options[i].description+j);
+ 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] );
}
}
- putchar('\n');
- free(indent);
-}
-void HelpBsp()
-{
- struct HelpOption bsp[] = {
- {"-bsp <filename.map>", "Switch that enters this stage"},
- {"-altsplit", "Alternate BSP tree splitting weights (should give more fps)"},
- {"-celshader <shadername>", "Sets a global cel shader name"},
- {"-custinfoparms", "Read scripts/custinfoparms.txt"},
- {"-debuginset", "Push all triangle vertexes towards the triangle center"},
- {"-debugportals", "Make BSP portals visible in the map"},
- {"-debugsurfaces", "Color the vertexes according to the index of the surface"},
- {"-deep", "Use detail brushes in the BSP tree, but at lowest priority (should give more fps)"},
- {"-de <F>", "Distance epsilon for plane snapping etc."},
- {"-fakemap", "Write fakemap.map containing all world brushes"},
- {"-flares", "Turn on support for flares (TEST?)"},
- {"-flat", "Enable flat shading (good for combining with -celshader)"},
- {"-fulldetail", "Treat detail brushes as structural ones"},
- {"-leaktest", "Abort if a leak was found"},
- {"-meta", "Combine adjacent triangles of the same texture to surfaces (ALWAYS USE THIS)"},
- {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},
- {"-mi <N>", "Sets the maximum number of indexes per surface"},
- {"-mv <N>", "Sets the maximum number of vertices of a lightmapped surface"},
- {"-ne <F>", "Normal epsilon for plane snapping etc."},
- {"-nocurves", "Turn off support for patches"},
- {"-nodetail", "Leave out detail brushes"},
- {"-noflares", "Turn off support for flares"},
- {"-nofog", "Turn off support for fog volumes"},
- {"-nohint", "Turn off support for hint brushes"},
- {"-nosubdivide", "Turn off support for `q3map_tessSize` (breaks water vertex deforms)"},
- {"-notjunc", "Do not fix T-junctions (causes cracks between triangles, do not use)"},
- {"-nowater", "Turn off support for water, slime or lava (Stef, this is for you)"},
- {"-np <A>", "Force all surfaces to be nonplanar with a given shade angle"},
- {"-onlyents", "Only update entities in the BSP"},
- {"-patchmeta", "Turn patches into triangle meshes for display"},
- {"-rename", "Append “bspâ€\9d suffix to miscmodel shaders (needed for SoF2)"},
- {"-samplesize <N>", "Sets default lightmap resolution in luxels/qu"},
- {"-skyfix", "Turn sky box into six surfaces to work around ATI problems"},
- {"-snap <N>", "Snap brush bevel planes to the given number of units"},
- {"-tempname <filename.map>", "Read the MAP file from the given file name"},
- {"-texrange <N>", "Limit per-surface texture range to the given number of units, and subdivide surfaces like with `q3map_tessSize` if this is not met"},
- {"-tmpout", "Write the BSP file to /tmp"},
- {"-verboseentities", "Enable `-v` only for map entities, not for the world"},
- };
- HelpOptions("BSP Stage", 0, 80, bsp, sizeof(bsp)/sizeof(struct HelpOption));
-}
-void HelpVis()
-{
- struct HelpOption vis[] = {
- {"-vis <filename.map>", "Switch that enters this stage"},
- {"-fast", "Very fast and crude vis calculation"},
- {"-mergeportals", "The less crude half of `-merge`, makes vis sometimes much faster but doesn't hurt fps usually"},
- {"-merge", "Faster but still okay vis calculation"},
- {"-nopassage", "Just use PortalFlow vis (usually less fps)"},
- {"-nosort", "Do not sort the portals before calculating vis (usually slower)"},
- {"-passageOnly", "Just use PassageFlow vis (usually less fps)"},
- {"-saveprt", "Keep the PRT file after running vis (so you can run vis again)"},
- {"-tmpin", "Use /tmp folder for input"},
- {"-tmpout", "Use /tmp folder for output"},
- };
- HelpOptions("VIS Stage", 0, 80, vis, sizeof(vis)/sizeof(struct HelpOption));
-}
-void HelpLight()
-{
- struct HelpOption light[] = {
- {"-light <filename.map>", "Switch that enters this stage"},
- {"-vlight <filename.map>", "Deprecated alias for `-light -fast` ... filename.map"},
- {"-approx <N>", "Vertex light approximation tolerance (never use in conjunction with deluxemapping)"},
- {"-areascale <F, `-area` F>", "Scaling factor for area lights (surfacelight)"},
- {"-border", "Add a red border to lightmaps for debugging"},
- {"-bouncegrid", "Also compute radiosity on the light grid"},
- {"-bounceonly", "Only compute radiosity"},
- {"-bouncescale <F>", "Scaling factor for radiosity"},
- {"-bounce <N>", "Number of bounces for radiosity"},
- {"-cheapgrid", "Use `-cheap` style lighting for radiosity"},
- {"-cheap", "Abort vertex light calculations when white is reached"},
- {"-compensate <F>", "Lightmap compensate (darkening factor applied after everything else)"},
- {"-cpma", "CPMA vertex lighting mode"},
- {"-custinfoparms", "Read scripts/custinfoparms.txt"},
- {"-dark", "Darken lightmap seams"},
- {"-debugaxis", "Color the lightmaps according to the lightmap axis"},
- {"-debugcluster", "Color the lightmaps according to the index of the cluster"},
- {"-debugdeluxe", "Show deluxemaps on the lightmap"},
- {"-debugnormals", "Color the lightmaps according to the direction of the surface normal"},
- {"-debugorigin", "Color the lightmaps according to the origin of the luxels"},
- {"-debugsurfaces, -debugsurface", "Color the lightmaps according to the index of the surface"},
- {"-debugunused", "This option does nothing"},
- {"-debug", "Mark the lightmaps according to the cluster: unmapped clusters get yellow, occluded ones get pink, flooded ones get blue overlay color, otherwise red"},
- {"-deluxemode 0", "Use modelspace deluxemaps (DarkPlaces)"},
- {"-deluxemode 1", "Use tangentspace deluxemaps"},
- {"-deluxe, -deluxemap", "Enable deluxemapping (light direction maps)"},
- {"-dirtdebug, -debugdirt", "Store the dirtmaps as lightmaps for debugging"},
- {"-dirtdepth", "Dirtmapping depth"},
- {"-dirtgain", "Dirtmapping exponent"},
- {"-dirtmode 0", "Ordered direction dirtmapping"},
- {"-dirtmode 1", "Randomized direction dirtmapping"},
- {"-dirtscale", "Dirtmapping scaling factor"},
- {"-dirty", "Enable dirtmapping"},
- {"-dump", "Dump radiosity from `-bounce` into numbered MAP file prefabs"},
- {"-export", "Export lightmaps when compile finished (like `-export` mode)"},
- {"-exposure <F>", "Lightmap exposure to better support overbright spots"},
- {"-external", "Force external lightmaps even if at size of internal lightmaps"},
- {"-extravisnudge", "Broken feature to nudge the luxel origin to a better vis cluster"},
- {"-extrawide", "Deprecated alias for `-super 2 -filter`"},
- {"-extra", "Deprecated alias for `-super 2`"},
- {"-fastbounce", "Use `-fast` style lighting for radiosity"},
- {"-faster", "Use a faster falloff curve for lighting; also implies `-fast`"},
- {"-fastgrid", "Use `-fast` style lighting for the light grid"},
- {"-fast", "Ignore tiny light contributions"},
- {"-filter", "Lightmap filtering"},
- {"-floodlight", "Enable floodlight (zero-effort somewhat decent lighting)"},
- {"-gamma <F>", "Lightmap gamma"},
- {"-gridambientscale <F>", "Scaling factor for the light grid ambient components only"},
- {"-gridscale <F>", "Scaling factor for the light grid only"},
- {"-keeplights", "Keep light entities in the BSP file after compile"},
- {"-lightmapdir <directory>", "Directory to store external lightmaps (default: same as map name without extension)"},
- {"-lightmapsize <N>", "Size of lightmaps to generate (must be a power of two)"},
- {"-lomem", "Low memory but slower lighting mode"},
- {"-lowquality", "Low quality floodlight (appears to currently break floodlight)"},
- {"-minsamplesize <N>", "Sets minimum lightmap resolution in luxels/qu"},
- {"-nocollapse", "Do not collapse identical lightmaps"},
- {"-nodeluxe, -nodeluxemap", "Disable deluxemapping"},
- {"-nogrid", "Disable grid light calculation (makes all entities fullbright)"},
- {"-nolightmapsearch", "Do not optimize lightmap packing for GPU memory usage (as doing so costs fps)"},
- {"-normalmap", "Color the lightmaps according to the direction of the surface normal (TODO is this identical to `-debugnormals`?)"},
- {"-nostyle, -nostyles", "Disable support for light styles"},
- {"-nosurf", "Disable tracing against surfaces (only uses BSP nodes then)"},
- {"-notrace", "Disable shadow occlusion"},
- {"-novertex", "Disable vertex lighting"},
- {"-patchshadows", "Cast shadows from patches"},
- {"-pointscale <F, `-point` F>", "Scaling factor for point lights (light entities)"},
- {"-q3", "Use nonlinear falloff curve by default (like Q3A)"},
- {"-samplescale <F>", "Scales all lightmap resolutions"},
- {"-samplesize <N>", "Sets default lightmap resolution in luxels/qu"},
- {"-samples <N>", "Adaptive supersampling quality"},
- {"-scale <F>", "Scaling factor for all light types"},
- {"-shadeangle <A>", "Angle for phong shading"},
- {"-shade", "Enable phong shading at default shade angle"},
- {"-skyscale <F, `-sky` F>", "Scaling factor for sky and sun light"},
- {"-smooth", "Deprecated alias for `-samples 2`"},
- {"-style, -styles", "Enable support for light styles"},
- {"-sunonly", "Only compute sun light"},
- {"-super <N, `-supersample` N>", "Ordered grid supersampling quality"},
- {"-thresh <F>", "Triangle subdivision threshold"},
- {"-trianglecheck", "Broken check that should ensure luxels apply to the right triangle"},
- {"-trisoup", "Convert brush faces to triangle soup"},
- {"-wolf", "Use linear falloff curve by default (like W:ET)"},
- };
-
- HelpOptions("Light Stage", 0, 80, light, sizeof(light)/sizeof(struct HelpOption));
-}
+ sprintf( packname, "%s/%s_autopacked.pk3", EnginePath, nameOFmap );
+ remove( packname );
-void HelpAnalize()
-{
- struct HelpOption analize[] = {
- {"-analyze <filename.bsp>", "Switch that enters this mode"},
- {"-lumpswap", "Swap byte order in the lumps"},
- };
+ Sys_Printf( "--- ZipZip ---\n" );
- HelpOptions("Analyzing BSP-like file structure", 0, 80, analize, sizeof(analize)/sizeof(struct HelpOption));
-}
-void HelpScale()
-{
- struct HelpOption scale[] = {
- {"-scale <S filename.bsp>", "Scale uniformly"},
- {"-scale <SX SY SZ filename.bsp>", "Scale non-uniformly"},
- {"-scale -tex <S filename.bsp>", "Scale uniformly without texture lock"},
- {"-scale -tex <SX SY SZ filename.bsp>", "Scale non-uniformly without texture lock"},
- };
- HelpOptions("Scaling", 0, 80, scale, sizeof(scale)/sizeof(struct HelpOption));
-}
-void HelpConvert()
-{
- struct HelpOption convert[] = {
- {"-convert <filename.bsp>", "Switch that enters this mode"},
- {"-de <number>", "Distance epsilon for the conversion"},
- {"-format <converter>", "Select the converter (available: map, ase, or game names)"},
- {"-ne <F>", "Normal epsilon for the conversion"},
- {"-shadersasbitmap", "(only for ase) use the shader names as \\*BITMAP key so they work as prefabs"},
- };
-
- HelpOptions("Converting & Decompiling", 0, 80, convert, sizeof(convert)/sizeof(struct HelpOption));
-}
+ Sys_Printf( "\n\tShader referenced textures....\n" );
-void HelpExport()
-{
- struct HelpOption exportl[] = {
- {"-export <filename.bsp>", "Copies lightmaps from the BSP to `filename/lightmap_0000.tga` ff"}
- };
+ 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] );
+ }
- HelpOptions("Exporting lightmaps", 0, 80, exportl, sizeof(exportl)/sizeof(struct HelpOption));
-}
+ 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] );
+ }
+ }
-void HelpFixaas()
-{
- struct HelpOption fixaas[] = {
- {"-fixaas <filename.bsp>", "Switch that enters this mode"},
- };
+ Sys_Printf( "\n\tShaizers....\n" );
- HelpOptions("Fixing AAS checksum", 0, 80, fixaas, sizeof(fixaas)/sizeof(struct HelpOption));
-}
+ 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] );
+ }
+ }
-void HelpInfo()
-{
- struct HelpOption info[] = {
- {"-info <filename.bsp>", "Switch that enters this mode"},
- };
+ Sys_Printf( "\n\tSounds....\n" );
- HelpOptions("Get info about BSP file", 0, 80, info, sizeof(info)/sizeof(struct HelpOption));
-}
+ 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] );
+ }
+ }
-void HelpImport()
-{
- struct HelpOption import[] = {
- {"-import <filename.bsp>", "Copies lightmaps from `filename/lightmap_0000.tga` ff into the BSP"},
- };
+ Sys_Printf( "\n\tVideos....\n" );
- HelpOptions("Importing lightmaps", 0, 80, import, sizeof(import)/sizeof(struct HelpOption));
-}
+ 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] );
+ }
-void HelpMinimap()
-{
- struct HelpOption minimap[] = {
- {"-minimap <filename.bsp>", "Creates a minimap of the BSP, by default writes to `../gfx/filename_mini.tga`"},
- {"-black", "Write the minimap as a black-on-transparency RGBA32 image"},
- {"-boost <F>", "Sets the contrast boost value (higher values make a brighter image); contrast boost is somewhat similar to gamma, but continuous even at zero"},
- {"-border <F>", "Sets the amount of border pixels relative to the total image size"},
- {"-gray", "Write the minimap as a white-on-black GRAY8 image"},
- {"-keepaspect", "Ensure the aspect ratio is kept (the minimap is then letterboxed to keep aspect)"},
- {"-minmax <xmin ymin zmin xmax ymax zmax>", "Forces specific map dimensions (note: the minimap actually uses these dimensions, scaled to the target size while keeping aspect with centering, and 1/64 of border appended to all sides)"},
- {"-nokeepaspect", "Do not ensure the aspect ratio is kept (makes it easier to use the image in your code, but looks bad together with sharpening)"},
- {"-o <filename.tga>", "Sets the output file name"},
- {"-random <N>", "Sets the randomized supersampling count (cannot be combined with `-samples`)"},
- {"-samples <N>", "Sets the ordered supersampling count (cannot be combined with `-random`)"},
- {"-sharpen <F>", "Sets the sharpening coefficient"},
- {"-size <N>", "Sets the width and height of the output image"},
- {"-white", "Write the minimap as a white-on-transparency RGBA32 image"},
- };
-
- HelpOptions("MiniMap", 0, 80, minimap, sizeof(minimap)/sizeof(struct HelpOption));
-}
+ Sys_Printf( "\n\t.\n" );
-void HelpCommon()
-{
- struct HelpOption common[] = {
- {"-connect <address>", "Talk to a NetRadiant instance using a specific XML based protocol"},
- {"-force", "Allow reading some broken/unsupported BSP files e.g. when decompiling, may also crash"},
- {"-fs_basepath <path>", "Sets the given path as main directory of the game (can be used more than once to look in multiple paths)"},
- {"-fs_game <gamename>", "Sets a different game directory name (default for Q3A: baseq3)"},
- {"-fs_homebase <dir>", "Specifies where the user home directory name is on Linux (default for Q3A: .q3a)"},
- {"-game <gamename>", "Load settings for the given game (default: quake3)"},
- {"-subdivisions <F>", "multiplier for patch subdivisions quality"},
- {"-threads <N>", "number of threads to use"},
- {"-v", "Verbose mode"}
- };
-
- HelpOptions("Common Options", 0, 80, common, sizeof(common)/sizeof(struct HelpOption));
+ sprintf( temp, "maps/%s.bsp", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
+ }
-}
+ sprintf( temp, "maps/%s.aas", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
+ }
-void Help(const char* arg)
-{
- printf("Usage: q3map2 [stage] [common options...] [stage options...] [stage source file]\n");
- printf(" q3map2 -help [stage]\n\n");
-
- HelpCommon();
-
- struct HelpOption stages[] = {
- {"-bsp", "BSP Stage"},
- {"-vis", "VIS Stage"},
- {"-light", "Light Stage"},
- {"-analize", "Analyzing BSP-like file structure"},
- {"-scale", "Scaling"},
- {"-convert", "Converting & Decompiling"},
- {"-export", "Exporting lightmaps"},
- {"-fixaas", "Fixing AAS checksum"},
- {"-info", "Get info about BSP file"},
- {"-import", "Importing lightmaps"},
- {"-minimap", "MiniMap"},
- };
- void(*help_funcs[])() = {
- HelpBsp,
- HelpVis,
- HelpLight,
- HelpAnalize,
- HelpScale,
- HelpConvert,
- HelpExport,
- HelpFixaas,
- HelpInfo,
- HelpImport,
- HelpMinimap
- };
-
- if ( arg && strlen(arg) > 0 )
- {
- if ( arg[0] == '-' )
- arg++;
+ sprintf( temp, "scripts/%s.arena", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
+ }
- unsigned i;
- for ( i = 0; i < sizeof(stages)/sizeof(struct HelpOption); i++ )
- if ( strcmp(arg, stages[i].name+1) == 0 )
- {
- help_funcs[i]();
- return;
- }
+ sprintf( temp, "scripts/%s.defi", nameOFmap );
+ if ( vfsPackFile( temp, packname ) ){
+ Sys_Printf( "++%s\n", temp );
+ }
+ else{
+ Sys_Printf( " !FAIL! %s\n", temp );
}
- HelpOptions("Stages", 0, 80, stages, sizeof(stages)/sizeof(struct HelpOption));
+ Sys_Printf( "\nSaved to %s\n", packname );
+ /* return to sender */
+ return 0;
}
+
/*
main()
q3map mojo...
int main( int argc, char **argv ){
int i, r;
double start, end;
+ extern qboolean werror;
/* we want consistent 'randomness' */
/* -help */
if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" )
|| !strcmp( argv[ i ], "-help" ) ) {
- Help(argv[i+1]);
+ HelpMain(argv[i+1]);
return 0;
}
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;
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 */
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 );
/* 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 */
/* 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 );
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" ) ) {
r = ConvertBSPMain( argc - 1, argv + 1 );
projects / xonotic / netradiant.git / blobdiff