/* shift origin */
GetVectorForKey( &entities[ i ], "origin", vec );
if ( ( vec[ 0 ] || vec[ 1 ] || vec[ 2 ] ) ) {
-- if ( !strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
++ 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 ) ) {
++ if ( !!strncmp( ValueForKey( &entities[i], "classname" ), "info_player_", 12 ) ) {
vec[2] -= spawn_ref;
}
sprintf( str, "%f %f %f", vec[ 0 ], vec[ 1 ], vec[ 2 ] );
return;
}
- if ( stricmp( dot, ".tga" ) && stricmp( dot, ".jpg" ) && stricmp( dot, ".png" ) ){
+ /* 4 repack */
+ void tex2list2( char* texlist, int *texnum, char* EXtex, int *EXtexnum, char* rEXtex, int *rEXtexnum ){
+ int i;
+ if ( token[0] == '\0') return;
+ //StripExtension( token );
+ char* dot = strrchr( token, '.' );
+ if ( dot != NULL){
- if ( !stricmp( texlist + i*65, texlist + (*texnum)*65 ) ) return;
++ if ( Q_stricmp( dot, ".tga" ) && Q_stricmp( dot, ".jpg" ) && Q_stricmp( dot, ".png" ) ){
+ Sys_Printf( "WARNING4: %s : weird or missing extension in shader\n", token );
+ }
+ else{
+ *dot = '\0';
+ }
+ }
+ FixDOSName( token );
+ strcpy ( texlist + (*texnum)*65, token );
+ strcat( token, ".tga" );
+
+ /* exclude */
+ for ( i = 0; i < *texnum; i++ ){
- if ( !stricmp( EXtex + i*65, texlist + (*texnum)*65 ) ) return;
++ if ( !Q_stricmp( texlist + i*65, texlist + (*texnum)*65 ) ) return;
+ }
+ for ( i = 0; i < *EXtexnum; i++ ){
- if ( !stricmp( rEXtex + i*65, texlist + (*texnum)*65 ) ) return;
++ if ( !Q_stricmp( EXtex + i*65, texlist + (*texnum)*65 ) ) return;
+ }
+ for ( i = 0; i < *rEXtexnum; i++ ){
++ if ( !Q_stricmp( rEXtex + i*65, texlist + (*texnum)*65 ) ) return;
+ }
+ (*texnum)++;
+ return;
+ }
+
/*
Check if newcoming res is unique
*/
void res2list( char* data, int *num ){
int i;
+ if ( strlen( data + (*num)*65 ) > 64 ){
+ Sys_Printf( "WARNING6: %s : path too long.\n", data + (*num)*65 );
+ }
+ while ( *( data + (*num)*65 ) == '\\' || *( data + (*num)*65 ) == '/' ){
+ char* cut = data + (*num)*65 + 1;
+ strcpy( data + (*num)*65, cut );
+ }
if ( *( data + (*num)*65 ) == '\0') return;
for ( i = 0; i < *num; i++ ){
- if ( !stricmp( data + i*65, data + (*num)*65 ) ) return;
+ if ( !Q_stricmp( data[i], data[*num] ) ) return;
}
(*num)++;
return;
tex2list( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN );
}
}
- else if ( !stricmp( token, "videoMap" ) ){
+ else if ( !Q_stricmp( token, "videoMap" ) ){
GetToken( qfalse );
FixDOSName( token );
- if ( strchr( token, "/" ) == NULL ){
+ if ( strchr( token, '/' ) == NULL && strchr( token, '\\' ) == NULL ){
sprintf( temp, "video/%s", token );
strcpy( token, temp );
}
+ FixDOSName( token );
for ( j = 0; j < pk3VideosN; j++ ){
- if ( !stricmp( pk3Videos + j*65, token ) ){
+ if ( !Q_stricmp( pk3Videos + j*65, token ) ){
goto away;
}
}
/*
- main()
- q3map mojo...
+ repackBSPMain()
+ repack multiple maps, strip only required shaders
+ works for Q3 type of shaders and ents
*/
- int main( int argc, char **argv ){
- int i, r;
- double start, end;
- extern qboolean werror;
+ int repackBSPMain( int argc, char **argv ){
+ int i, j, len, compLevel = 0;
+ 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;
+ }
+ else if ( !strcmp( argv[ i ], "-complevel" ) ) {
+ compLevel = atoi( argv[ i + 1 ] );
+ i++;
+ if ( compLevel < -1 ) compLevel = -1;
+ if ( compLevel > 10 ) compLevel = 10;
+ Sys_Printf( "Compression level set to %i\n", compLevel );
+ }
+ }
- /* we want consistent 'randomness' */
- srand( 0 );
+ /* load exclusions file */
+ int ExTexturesN = 0;
+ char* ExTextures = (char *)calloc( 4096*65, sizeof( char ) );
+ int ExShadersN = 0;
+ char* ExShaders = (char *)calloc( 4096*65, sizeof( char ) );
+ int ExSoundsN = 0;
+ char* ExSounds = (char *)calloc( 4096*65, sizeof( char ) );
+ int ExShaderfilesN = 0;
+ char* ExShaderfiles = (char *)calloc( 4096*65, sizeof( char ) );
+ int ExVideosN = 0;
+ char* ExVideos = (char *)calloc( 4096*65, sizeof( char ) );
+ int ExPureTexturesN = 0;
+ char* ExPureTextures = (char *)calloc( 4096*65, sizeof( char ) );
- /* start timer */
- start = I_FloatTime();
- /* this was changed to emit version number over the network */
- printf( Q3MAP_VERSION "\n" );
+ char exName[ 1024 ];
+ byte *buffer;
+ int size;
- /* set exit call */
- atexit( ExitQ3Map );
+ 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[1] = '\0';
+ strcat( exName, game->arg );
+ strcat( exName, ".exclude" );
- /* read general options first */
- for ( i = 1; i < argc; i++ )
+ 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 );
+
+ /* tokenize it */
+ while ( 1 )
{
- /* -help */
- if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" )
- || !strcmp( argv[ i ], "-help" ) ) {
- HelpMain(argv[i+1]);
- return 0;
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
}
- /* -connect */
- if ( !strcmp( argv[ i ], "-connect" ) ) {
- argv[ i ] = NULL;
- i++;
- Broadcast_Setup( argv[ i ] );
- argv[ i ] = NULL;
+ /* blocks */
- if ( !stricmp( token, "textures" ) ){
++ if ( !Q_stricmp( token, "textures" ) ){
+ parseEXblock ( ExTextures, &ExTexturesN, exName );
}
-
- /* verbose */
- else if ( !strcmp( argv[ i ], "-v" ) ) {
- if ( !verbose ) {
- verbose = qtrue;
- argv[ i ] = NULL;
- }
- else if ( !stricmp( token, "shaders" ) ){
++ else if ( !Q_stricmp( token, "shaders" ) ){
+ parseEXblock ( ExShaders, &ExShadersN, exName );
}
-
- /* force */
- else if ( !strcmp( argv[ i ], "-force" ) ) {
- force = qtrue;
- argv[ i ] = NULL;
- else if ( !stricmp( token, "shaderfiles" ) ){
++ else if ( !Q_stricmp( token, "shaderfiles" ) ){
+ parseEXblock ( ExShaderfiles, &ExShaderfilesN, exName );
}
-
- /* make all warnings into errors */
- else if ( !strcmp( argv[ i ], "-werror" ) ) {
- werror = qtrue;
- argv[ i ] = NULL;
- else if ( !stricmp( token, "sounds" ) ){
++ else if ( !Q_stricmp( token, "sounds" ) ){
+ parseEXblock ( ExSounds, &ExSoundsN, exName );
}
-
- /* patch subdivisions */
- else if ( !strcmp( argv[ i ], "-subdivisions" ) ) {
- argv[ i ] = NULL;
- i++;
- patchSubdivisions = atoi( argv[ i ] );
- argv[ i ] = NULL;
- if ( patchSubdivisions <= 0 ) {
- patchSubdivisions = 1;
- }
- else if ( !stricmp( token, "videos" ) ){
++ else if ( !Q_stricmp( token, "videos" ) ){
+ parseEXblock ( ExVideos, &ExVideosN, exName );
}
-
- /* threads */
- else if ( !strcmp( argv[ i ], "-threads" ) ) {
- argv[ i ] = NULL;
- i++;
- numthreads = atoi( argv[ i ] );
- argv[ i ] = NULL;
+ else{
+ Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
}
+ }
- else if( !strcmp( argv[ i ], "-nocmdline" ) )
- {
- Sys_Printf( "noCmdLine\n" );
- nocmdline = qtrue;
- argv[ i ] = NULL;
- }
+ /* free the buffer */
+ free( buffer );
- if ( !stricmp( ExTextures + i*65, ExShaders + j*65 ) ){
+ for ( i = 0; i < ExTexturesN; i++ ){
+ for ( j = 0; j < ExShadersN; j++ ){
++ if ( !Q_stricmp( ExTextures + i*65, ExShaders + j*65 ) ){
+ break;
+ }
+ }
+ if ( j == ExShadersN ){
+ strcpy ( ExPureTextures + ExPureTexturesN*65, ExTextures + i*65 );
+ ExPureTexturesN++;
+ }
}
- /* init model library */
- PicoInit();
- PicoSetMallocFunc( safe_malloc );
- PicoSetFreeFunc( free );
- PicoSetPrintFunc( PicoPrintFunc );
- PicoSetLoadFileFunc( PicoLoadFileFunc );
- PicoSetFreeFileFunc( free );
-
- /* set number of threads */
- ThreadSetDefault();
+ skipEXfile:
- /* generate sinusoid jitter table */
- for ( i = 0; i < MAX_JITTERS; i++ )
- {
- jitters[ i ] = sin( i * 139.54152147 );
- //% Sys_Printf( "Jitter %4d: %f\n", i, jitters[ i ] );
+ if( dbg ){
+ Sys_Printf( "\n\tExTextures....%i\n", ExTexturesN );
+ for ( i = 0; i < ExTexturesN; i++ ) Sys_Printf( "%s\n", ExTextures + i*65 );
+ Sys_Printf( "\n\tExPureTextures....%i\n", ExPureTexturesN );
+ for ( i = 0; i < ExPureTexturesN; i++ ) Sys_Printf( "%s\n", ExPureTextures + i*65 );
+ Sys_Printf( "\n\tExShaders....%i\n", ExShadersN );
+ for ( i = 0; i < ExShadersN; i++ ) Sys_Printf( "%s\n", ExShaders + i*65 );
+ Sys_Printf( "\n\tExShaderfiles....%i\n", ExShaderfilesN );
+ for ( i = 0; i < ExShaderfilesN; i++ ) Sys_Printf( "%s\n", ExShaderfiles + i*65 );
+ Sys_Printf( "\n\tExSounds....%i\n", ExSoundsN );
+ for ( i = 0; i < ExSoundsN; i++ ) Sys_Printf( "%s\n", ExSounds + i*65 );
+ Sys_Printf( "\n\tExVideos....%i\n", ExVideosN );
+ for ( i = 0; i < ExVideosN; i++ ) Sys_Printf( "%s\n", ExVideos + i*65 );
}
- /* 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 );
+ /* load repack.exclude */
+ int rExTexturesN = 0;
+ char* rExTextures = (char *)calloc( 65536*65, sizeof( char ) );
+ int rExShadersN = 0;
+ char* rExShaders = (char *)calloc( 32768*65, sizeof( char ) );
+ int rExSoundsN = 0;
+ char* rExSounds = (char *)calloc( 8192*65, sizeof( char ) );
+ int rExShaderfilesN = 0;
+ char* rExShaderfiles = (char *)calloc( 4096*65, sizeof( char ) );
+ int rExVideosN = 0;
+ char* rExVideos = (char *)calloc( 4096*65, sizeof( char ) );
- /* set game options */
- if ( !patchSubdivisions ) {
- patchSubdivisions = game->patchSubdivisions;
+ strcpy( exName, q3map2path );
+ cut = strrchr( exName, '\\' );
+ cut2 = strrchr( exName, '/' );
+ if ( cut == NULL && cut2 == NULL ){
+ Sys_Printf( "WARNING: Unable to load repack exclusions file.\n" );
+ goto skipEXrefile;
}
+ if ( cut2 > cut ) cut = cut2;
+ cut[1] = '\0';
+ strcat( exName, "repack.exclude" );
- /* check if we have enough options left to attempt something */
- if ( argc < 2 ) {
- Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
+ Sys_Printf( "Loading %s\n", exName );
+ size = TryLoadFile( exName, (void**) &buffer );
+ if ( size <= 0 ) {
+ Sys_Printf( "WARNING: Unable to find repack exclusions file %s.\n", exName );
+ goto skipEXrefile;
}
- /* fixaas */
- if ( !strcmp( argv[ 1 ], "-fixaas" ) ) {
- r = FixAASMain( argc - 1, argv + 1 );
- }
+ /* parse the file */
+ ParseFromMemory( (char *) buffer, size );
- /* analyze */
- else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
- r = AnalyzeBSPMain( argc - 1, argv + 1 );
- }
+ /* tokenize it */
+ while ( 1 )
+ {
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
- /* info */
- else if ( !strcmp( argv[ 1 ], "-info" ) ) {
- r = BSPInfoMain( argc - 2, argv + 2 );
+ /* blocks */
- if ( !stricmp( token, "textures" ) ){
++ if ( !Q_stricmp( token, "textures" ) ){
+ parseEXblock ( rExTextures, &rExTexturesN, exName );
+ }
- else if ( !stricmp( token, "shaders" ) ){
++ else if ( !Q_stricmp( token, "shaders" ) ){
+ parseEXblock ( rExShaders, &rExShadersN, exName );
+ }
- else if ( !stricmp( token, "shaderfiles" ) ){
++ else if ( !Q_stricmp( token, "shaderfiles" ) ){
+ parseEXblock ( rExShaderfiles, &rExShaderfilesN, exName );
+ }
- else if ( !stricmp( token, "sounds" ) ){
++ else if ( !Q_stricmp( token, "sounds" ) ){
+ parseEXblock ( rExSounds, &rExSoundsN, exName );
+ }
- else if ( !stricmp( token, "videos" ) ){
++ else if ( !Q_stricmp( token, "videos" ) ){
+ parseEXblock ( rExVideos, &rExVideosN, exName );
+ }
+ else{
+ Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
+ }
}
- /* vis */
- else if ( !strcmp( argv[ 1 ], "-vis" ) ) {
- r = VisMain( argc - 1, argv + 1 );
+ /* free the buffer */
+ free( buffer );
+
+ skipEXrefile:
+
+ if( dbg ){
+ Sys_Printf( "\n\trExTextures....%i\n", rExTexturesN );
+ for ( i = 0; i < rExTexturesN; i++ ) Sys_Printf( "%s\n", rExTextures + i*65 );
+ Sys_Printf( "\n\trExShaders....%i\n", rExShadersN );
+ for ( i = 0; i < rExShadersN; i++ ) Sys_Printf( "%s\n", rExShaders + i*65 );
+ Sys_Printf( "\n\trExShaderfiles....%i\n", rExShaderfilesN );
+ for ( i = 0; i < rExShaderfilesN; i++ ) Sys_Printf( "%s\n", rExShaderfiles + i*65 );
+ Sys_Printf( "\n\trExSounds....%i\n", rExSoundsN );
+ for ( i = 0; i < rExSoundsN; i++ ) Sys_Printf( "%s\n", rExSounds + i*65 );
+ Sys_Printf( "\n\trExVideos....%i\n", rExVideosN );
+ for ( i = 0; i < rExVideosN; i++ ) Sys_Printf( "%s\n", rExVideos + i*65 );
+ }
+
+
+
+
+ int bspListN = 0;
+ char* bspList = (char *)calloc( 8192*1024, sizeof( char ) );
+
+ /* do some path mangling */
+ strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
- if ( !stricmp( strrchr( source, '.' ), ".bsp" ) ){
++ if ( !Q_stricmp( strrchr( source, '.' ), ".bsp" ) ){
+ strcpy( bspList, source );
+ bspListN++;
+ }
+ else{
+ /* load bsps paths list */
+ Sys_Printf( "Loading %s\n", source );
+ size = TryLoadFile( source, (void**) &buffer );
+ if ( size <= 0 ) {
+ Sys_Printf( "WARNING: Unable to open bsps paths list file %s.\n", source );
+ }
+
+ /* parse the file */
+ ParseFromMemory( (char *) buffer, size );
+
+ /* tokenize it */
+ while ( 1 )
+ {
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ strcpy( bspList + bspListN * 1024 , token );
+ bspListN++;
+ }
+
+ /* free the buffer */
+ free( buffer );
+ }
+
+ char packname[ 1024 ], nameOFrepack[ 1024 ], nameOFmap[ 1024 ], temp[ 1024 ];
+
+ /* copy input file name */
+ strcpy( temp, source );
+ StripExtension( temp );
+
+ /* extract input file name */
+ len = strlen( temp ) - 1;
+ while ( len > 0 && temp[ len ] != '/' && temp[ len ] != '\\' )
+ len--;
+ strcpy( nameOFrepack, &temp[ len + 1 ] );
+
+
+ /* load bsps */
+ int pk3ShadersN = 0;
+ char* pk3Shaders = (char *)calloc( 65536*65, sizeof( char ) );
+ int pk3SoundsN = 0;
+ char* pk3Sounds = (char *)calloc( 4096*65, sizeof( char ) );
+ int pk3ShaderfilesN = 0;
+ char* pk3Shaderfiles = (char *)calloc( 4096*65, sizeof( char ) );
+ int pk3TexturesN = 0;
+ char* pk3Textures = (char *)calloc( 65536*65, sizeof( char ) );
+ int pk3VideosN = 0;
+ char* pk3Videos = (char *)calloc( 1024*65, sizeof( char ) );
+
+ for( j = 0; j < bspListN; j++ ){
+
+ int pk3SoundsNold = pk3SoundsN;
+ int pk3ShadersNold = pk3ShadersN;
+
+ strcpy( source, bspList + j*1024 );
+ StripExtension( source );
+ DefaultExtension( source, ".bsp" );
+
+ /* load the bsp */
+ Sys_Printf( "\nLoading %s\n", source );
+ PartialLoadBSPFile( source );
+ ParseEntities();
+
+ /* copy map name */
+ strcpy( temp, source );
+ StripExtension( temp );
+
+ /* extract map name */
+ len = strlen( temp ) - 1;
+ while ( len > 0 && temp[ len ] != '/' && temp[ len ] != '\\' )
+ len--;
+ strcpy( nameOFmap, &temp[ len + 1 ] );
+
+
+ qboolean drawsurfSHs[1024] = { qfalse };
+
+ for ( i = 0; i < numBSPDrawSurfaces; i++ ){
+ drawsurfSHs[ bspDrawSurfaces[i].shaderNum ] = qtrue;
+ }
+
+ for ( i = 0; i < numBSPShaders; i++ ){
+ if ( drawsurfSHs[i] ){
+ strcpy( pk3Shaders + pk3ShadersN*65, bspShaders[i].shader );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
+ }
+
+ /* Ent keys */
+ epair_t *ep;
+ for ( ep = entities[0].epairs; ep != NULL; ep = ep->next )
+ {
- if ( !strnicmp( ep->key, "vertexremapshader", 17 ) ) {
++ if ( !!Q_strncasecmp( ep->key, "vertexremapshader", 17 ) ) {
+ sscanf( ep->value, "%*[^;] %*[;] %s", pk3Shaders + pk3ShadersN*65 );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
+ }
+ strcpy( pk3Sounds + pk3SoundsN*65, ValueForKey( &entities[0], "music" ) );
+ if ( *( pk3Sounds + pk3SoundsN*65 ) != '\0' ){
+ FixDOSName( pk3Sounds + pk3SoundsN*65 );
+ DefaultExtension( pk3Sounds + pk3SoundsN*65, ".wav" );
+ res2list( pk3Sounds, &pk3SoundsN );
+ }
+
+ for ( i = 0; i < numBSPEntities && i < numEntities; i++ )
+ {
+ strcpy( pk3Sounds + pk3SoundsN*65, ValueForKey( &entities[i], "noise" ) );
+ if ( *( pk3Sounds + pk3SoundsN*65 ) != '\0' && *( pk3Sounds + pk3SoundsN*65 ) != '*' ){
+ FixDOSName( pk3Sounds + pk3SoundsN*65 );
+ DefaultExtension( pk3Sounds + pk3SoundsN*65, ".wav" );
+ res2list( pk3Sounds, &pk3SoundsN );
+ }
+
- if ( !stricmp( ValueForKey( &entities[i], "classname" ), "func_plat" ) ){
++ if ( !Q_stricmp( ValueForKey( &entities[i], "classname" ), "func_plat" ) ){
+ strcpy( pk3Sounds + pk3SoundsN*65, "sound/movers/plats/pt1_strt.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
+ strcpy( pk3Sounds + pk3SoundsN*65, "sound/movers/plats/pt1_end.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
+ }
- if ( !stricmp( ValueForKey( &entities[i], "classname" ), "target_push" ) ){
++ if ( !Q_stricmp( ValueForKey( &entities[i], "classname" ), "target_push" ) ){
+ if ( !(IntForKey( &entities[i], "spawnflags") & 1) ){
+ strcpy( pk3Sounds + pk3SoundsN*65, "sound/misc/windfly.wav");
+ res2list( pk3Sounds, &pk3SoundsN );
+ }
+ }
+ strcpy( pk3Shaders + pk3ShadersN*65, ValueForKey( &entities[i], "targetShaderNewName" ) );
+ res2list( pk3Shaders, &pk3ShadersN );
+ }
+
+ //levelshot
+ sprintf( pk3Shaders + pk3ShadersN*65, "levelshots/%s", nameOFmap );
+ res2list( pk3Shaders, &pk3ShadersN );
+
+
+
+ Sys_Printf( "\n\t+Drawsurface+ent calls....%i\n", pk3ShadersN - pk3ShadersNold );
+ for ( i = pk3ShadersNold; i < pk3ShadersN; i++ ){
+ Sys_Printf( "%s\n", pk3Shaders + i*65 );
+ }
+ Sys_Printf( "\n\t+Sounds....%i\n", pk3SoundsN - pk3SoundsNold );
+ for ( i = pk3SoundsNold; i < pk3SoundsN; i++ ){
+ Sys_Printf( "%s\n", pk3Sounds + i*65 );
+ }
+ /* free bsp data */
+ /*
+ if ( bspDrawVerts != 0 ) {
+ free( bspDrawVerts );
+ bspDrawVerts = NULL;
+ //numBSPDrawVerts = 0;
+ Sys_Printf( "freed BSPDrawVerts\n" );
+ }
+ */ if ( bspDrawSurfaces != 0 ) {
+ free( bspDrawSurfaces );
+ bspDrawSurfaces = NULL;
+ //numBSPDrawSurfaces = 0;
+ //Sys_Printf( "freed bspDrawSurfaces\n" );
+ }
+ /* if ( bspLightBytes != 0 ) {
+ free( bspLightBytes );
+ bspLightBytes = NULL;
+ //numBSPLightBytes = 0;
+ Sys_Printf( "freed BSPLightBytes\n" );
+ }
+ if ( bspGridPoints != 0 ) {
+ free( bspGridPoints );
+ bspGridPoints = NULL;
+ //numBSPGridPoints = 0;
+ Sys_Printf( "freed BSPGridPoints\n" );
+ }
+ if ( bspPlanes != 0 ) {
+ free( bspPlanes );
+ bspPlanes = NULL;
+ Sys_Printf( "freed bspPlanes\n" );
+ //numBSPPlanes = 0;
+ //allocatedBSPPlanes = 0;
+ }
+ if ( bspBrushes != 0 ) {
+ free( bspBrushes );
+ bspBrushes = NULL;
+ Sys_Printf( "freed bspBrushes\n" );
+ //numBSPBrushes = 0;
+ //allocatedBSPBrushes = 0;
+ }
+ */ if ( entities != 0 ) {
+ epair_t *ep2free;
+ for ( i = 0; i < numBSPEntities && i < numEntities; i++ ){
+ ep = entities[i].epairs;
+ while( ep != NULL){
+ ep2free = ep;
+ ep = ep->next;
+ free( ep2free );
+ }
+ }
+ free( entities );
+ entities = NULL;
+ //Sys_Printf( "freed entities\n" );
+ numEntities = 0;
+ numBSPEntities = 0;
+ allocatedEntities = 0;
+ }
+ /* if ( bspModels != 0 ) {
+ free( bspModels );
+ bspModels = NULL;
+ Sys_Printf( "freed bspModels\n" );
+ //numBSPModels = 0;
+ //allocatedBSPModels = 0;
+ }
+ */ if ( bspShaders != 0 ) {
+ free( bspShaders );
+ bspShaders = NULL;
+ //Sys_Printf( "freed bspShaders\n" );
+ //numBSPShaders = 0;
+ //allocatedBSPShaders = 0;
+ }
+ if ( bspEntData != 0 ) {
+ free( bspEntData );
+ bspEntData = NULL;
+ //Sys_Printf( "freed bspEntData\n" );
+ //bspEntDataSize = 0;
+ //allocatedBSPEntData = 0;
+ }
+ /* if ( bspNodes != 0 ) {
+ free( bspNodes );
+ bspNodes = NULL;
+ Sys_Printf( "freed bspNodes\n" );
+ //numBSPNodes = 0;
+ //allocatedBSPNodes = 0;
+ }
+ if ( bspDrawIndexes != 0 ) {
+ free( bspDrawIndexes );
+ bspDrawIndexes = NULL;
+ Sys_Printf( "freed bspDrawIndexes\n" );
+ //numBSPDrawIndexes = 0;
+ //allocatedBSPDrawIndexes = 0;
+ }
+ if ( bspLeafSurfaces != 0 ) {
+ free( bspLeafSurfaces );
+ bspLeafSurfaces = NULL;
+ Sys_Printf( "freed bspLeafSurfaces\n" );
+ //numBSPLeafSurfaces = 0;
+ //allocatedBSPLeafSurfaces = 0;
+ }
+ if ( bspLeafBrushes != 0 ) {
+ free( bspLeafBrushes );
+ bspLeafBrushes = NULL;
+ Sys_Printf( "freed bspLeafBrushes\n" );
+ //numBSPLeafBrushes = 0;
+ //allocatedBSPLeafBrushes = 0;
+ }
+ if ( bspBrushSides != 0 ) {
+ free( bspBrushSides );
+ bspBrushSides = NULL;
+ Sys_Printf( "freed bspBrushSides\n" );
+ numBSPBrushSides = 0;
+ allocatedBSPBrushSides = 0;
+ }
+ if ( numBSPFogs != 0 ) {
+ Sys_Printf( "freed numBSPFogs\n" );
+ numBSPFogs = 0;
+ }
+ if ( numBSPAds != 0 ) {
+ Sys_Printf( "freed numBSPAds\n" );
+ numBSPAds = 0;
+ }
+ if ( numBSPLeafs != 0 ) {
+ Sys_Printf( "freed numBSPLeafs\n" );
+ numBSPLeafs = 0;
+ }
+ if ( numBSPVisBytes != 0 ) {
+ Sys_Printf( "freed numBSPVisBytes\n" );
+ numBSPVisBytes = 0;
+ }
+ */ }
+
+
+
+ vfsListShaderFiles( pk3Shaderfiles, &pk3ShaderfilesN );
+
+ if( dbg ){
+ Sys_Printf( "\n\tSchroider fileses.....%i\n", pk3ShaderfilesN );
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ Sys_Printf( "%s\n", pk3Shaderfiles + i*65 );
+ }
+ }
+
+
+
+ /* can exclude pure *base* textures right now, shouldn't create shaders for them anyway */
+ for ( i = 0; i < pk3ShadersN ; i++ ){
+ for ( j = 0; j < ExPureTexturesN ; j++ ){
- if ( !stricmp( pk3Shaders + i*65, ExPureTextures + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, ExPureTextures + j*65 ) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ }
+ /* can exclude repack.exclude shaders, assuming they got all their images */
+ for ( i = 0; i < pk3ShadersN ; i++ ){
+ for ( j = 0; j < rExShadersN ; j++ ){
- if ( !stricmp( pk3Shaders + i*65, rExShaders + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, rExShaders + j*65 ) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ }
+
+ //Parse Shader Files
+ Sys_Printf( "\t\nParsing shaders....\n\n" );
+ char shaderText[ 8192 ];
+ char* allShaders = (char *)calloc( 16777216, sizeof( char ) );
+ /* hack */
+ endofscript = qtrue;
+
+ for ( i = 0; i < pk3ShaderfilesN; i++ ){
+ qboolean wantShader = qfalse;
+ int shader;
+
+ /* load the shader */
+ sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles + i*65 );
+ if ( dbg ) Sys_Printf( "\n\tentering %s\n", pk3Shaderfiles + i*65 );
+ SilentLoadScriptFile( temp, 0 );
+
+ /* tokenize it */
+ while ( 1 )
+ {
+ int line = scriptline;
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ //dump shader names
+ if( dbg ) Sys_Printf( "%s\n", token );
+
+ strcpy( shaderText, token );
+
+ if ( strchr( token, '\\') != NULL ){
+ Sys_Printf( "WARNING1: %s : %s : shader name with backslash\n", pk3Shaderfiles + i*65, token );
+ }
+
+ /* do wanna le shader? */
+ wantShader = qfalse;
+ for ( j = 0; j < pk3ShadersN; j++ ){
- if ( !stricmp( pk3Shaders + j*65, token) ){
++ if ( !Q_stricmp( pk3Shaders + j*65, token) ){
+ shader = j;
+ wantShader = qtrue;
+ break;
+ }
+ }
+ if ( wantShader ){
+ for ( j = 0; j < rExTexturesN ; j++ ){
- if ( !stricmp( pk3Shaders + shader*65, rExTextures + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + shader*65, rExTextures + j*65 ) ){
+ Sys_Printf( "WARNING3: %s : about to include shader for excluded texture\n", pk3Shaders + shader*65 );
+ break;
+ }
+ }
+ }
+
+ /* handle { } section */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( strcmp( token, "{" ) ) {
+ Error( "ParseShaderFile: %s, line %d: { not found!\nFound instead: %s",
+ temp, scriptline, token );
+ }
+ strcat( shaderText, "\n{" );
+ qboolean hasmap = qfalse;
+
+ while ( 1 )
+ {
+ line = scriptline;
+ /* get the next token */
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( !strcmp( token, "}" ) ) {
+ strcat( shaderText, "\n}\n\n" );
+ break;
+ }
+ /* parse stage directives */
+ if ( !strcmp( token, "{" ) ) {
+ qboolean tokenready = qfalse;
+ strcat( shaderText, "\n\t{" );
+ while ( 1 )
+ {
+ /* detour of TokenAvailable() '~' */
+ if ( tokenready ) tokenready = qfalse;
+ else line = scriptline;
+ if ( !GetToken( qtrue ) ) {
+ break;
+ }
+ if ( !strcmp( token, "}" ) ) {
+ strcat( shaderText, "\n\t}" );
+ break;
+ }
+ /* skip the shader */
+ if ( !wantShader ) continue;
+
+ /* digest any images */
- if ( !stricmp( token, "map" ) ||
- !stricmp( token, "clampMap" ) ) {
++ if ( !Q_stricmp( token, "map" ) ||
++ !Q_stricmp( token, "clampMap" ) ) {
+ strcat( shaderText, "\n\t\t" );
+ strcat( shaderText, token );
+ hasmap = qtrue;
+
+ /* get an image */
+ GetToken( qfalse );
+ if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) {
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ }
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
- else if ( !stricmp( token, "animMap" ) ||
- !stricmp( token, "clampAnimMap" ) ) {
++ else if ( !Q_stricmp( token, "animMap" ) ||
++ !Q_stricmp( token, "clampAnimMap" ) ) {
+ strcat( shaderText, "\n\t\t" );
+ strcat( shaderText, token );
+ hasmap = qtrue;
+
+ GetToken( qfalse );// skip num
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ while ( TokenAvailable() ){
+ GetToken( qfalse );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ tokenready = qtrue;
+ }
- else if ( !stricmp( token, "videoMap" ) ){
++ else if ( !Q_stricmp( token, "videoMap" ) ){
+ strcat( shaderText, "\n\t\t" );
+ strcat( shaderText, token );
+ hasmap = qtrue;
+ GetToken( qfalse );
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ FixDOSName( token );
+ if ( strchr( token, '/' ) == NULL && strchr( token, '\\' ) == NULL ){
+ sprintf( temp, "video/%s", token );
+ strcpy( token, temp );
+ }
+ FixDOSName( token );
+ for ( j = 0; j < pk3VideosN; j++ ){
- if ( !stricmp( pk3Videos + j*65, token ) ){
++ if ( !Q_stricmp( pk3Videos + j*65, token ) ){
+ goto away;
+ }
+ }
+ for ( j = 0; j < ExVideosN; j++ ){
- if ( !stricmp( ExVideos + j*65, token ) ){
++ if ( !Q_stricmp( ExVideos + j*65, token ) ){
+ goto away;
+ }
+ }
+ for ( j = 0; j < rExVideosN; j++ ){
- if ( !stricmp( rExVideos + j*65, token ) ){
++ if ( !Q_stricmp( rExVideos + j*65, token ) ){
+ goto away;
+ }
+ }
+ strcpy ( pk3Videos + pk3VideosN*65, token );
+ pk3VideosN++;
+ away:
+ j = 0;
+ }
- else if ( !stricmp( token, "mapComp" ) || !stricmp( token, "mapNoComp" ) || !stricmp( token, "animmapcomp" ) || !stricmp( token, "animmapnocomp" ) ){
++ else if ( !Q_stricmp( token, "mapComp" ) || !Q_stricmp( token, "mapNoComp" ) || !Q_stricmp( token, "animmapcomp" ) || !Q_stricmp( token, "animmapnocomp" ) ){
+ Sys_Printf( "WARNING7: %s : %s shader\n", pk3Shaders + shader*65, token );
+ hasmap = qtrue;
+ if ( line == scriptline ){
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ else{
+ strcat( shaderText, "\n\t\t" );
+ strcat( shaderText, token );
+ }
+ }
+ else if ( line == scriptline ){
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ else{
+ strcat( shaderText, "\n\t\t" );
+ strcat( shaderText, token );
+ }
+ }
+ }
+ /* skip the shader */
+ else if ( !wantShader ) continue;
+
+ /* -----------------------------------------------------------------
+ surfaceparm * directives
+ ----------------------------------------------------------------- */
+
+ /* match surfaceparm */
- else if ( !stricmp( token, "surfaceparm" ) ) {
++ else if ( !Q_stricmp( token, "surfaceparm" ) ) {
+ strcat( shaderText, "\n\tsurfaceparm " );
+ GetToken( qfalse );
+ strcat( shaderText, token );
- if ( !stricmp( token, "nodraw" ) ) {
++ if ( !Q_stricmp( token, "nodraw" ) ) {
+ wantShader = qfalse;
+ *( pk3Shaders + shader*65 ) = '\0';
+ }
+ }
+
+ /* skyparms <outer image> <cloud height> <inner image> */
- else if ( !stricmp( token, "skyParms" ) ) {
++ else if ( !Q_stricmp( token, "skyParms" ) ) {
+ strcat( shaderText, "\n\tskyParms " );
+ hasmap = qtrue;
+ /* get image base */
+ GetToken( qfalse );
+ strcat( shaderText, token );
+
+ /* ignore bogus paths */
- if ( stricmp( token, "-" ) && stricmp( token, "full" ) ) {
++ if ( Q_stricmp( token, "-" ) && Q_stricmp( token, "full" ) ) {
+ strcpy ( temp, token );
+ sprintf( token, "%s_up", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ sprintf( token, "%s_dn", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ sprintf( token, "%s_lf", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ sprintf( token, "%s_rt", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ sprintf( token, "%s_bk", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ sprintf( token, "%s_ft", temp );
+ tex2list2( pk3Textures, &pk3TexturesN, ExTextures, &ExTexturesN, rExTextures, &rExTexturesN );
+ }
+ /* skip rest of line */
+ GetToken( qfalse );
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ GetToken( qfalse );
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
- else if ( !strnicmp( token, "implicit", 8 ) ){
++ else if ( !!Q_strncasecmp( token, "implicit", 8 ) ){
+ Sys_Printf( "WARNING5: %s : %s shader\n", pk3Shaders + shader*65, token );
+ hasmap = qtrue;
+ if ( line == scriptline ){
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ else{
+ strcat( shaderText, "\n\t" );
+ strcat( shaderText, token );
+ }
+ }
- else if ( !stricmp( token, "fogparms" ) ){
++ else if ( !Q_stricmp( token, "fogparms" ) ){
+ hasmap = qtrue;
+ if ( line == scriptline ){
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ else{
+ strcat( shaderText, "\n\t" );
+ strcat( shaderText, token );
+ }
+ }
+ else if ( line == scriptline ){
+ strcat( shaderText, " " );
+ strcat( shaderText, token );
+ }
+ else{
+ strcat( shaderText, "\n\t" );
+ strcat( shaderText, token );
+ }
+ }
+
+ //exclude shader
+ if ( wantShader && !hasmap ){
+ Sys_Printf( "WARNING8: %s : shader has no known maps\n", pk3Shaders + shader*65 );
+ wantShader = qfalse;
+ *( pk3Shaders + shader*65 ) = '\0';
+ }
+ if ( wantShader ){
+ for ( j = 0; j < ExShadersN; j++ ){
- if ( !stricmp( ExShaders + j*65, pk3Shaders + shader*65 ) ){
++ if ( !Q_stricmp( ExShaders + j*65, pk3Shaders + shader*65 ) ){
+ wantShader = qfalse;
+ *( pk3Shaders + shader*65 ) = '\0';
+ break;
+ }
+ }
+ if ( wantShader ){
+ strcat( allShaders, shaderText );
+ *( pk3Shaders + shader*65 ) = '\0';
+ }
+ }
+ }
+ }
+ /* TODO: RTCW's mapComp, mapNoComp, animmapcomp, animmapnocomp; nocompress?; ET's implicitmap, implicitblend, implicitmask */
+
+
+ /* exclude stuff */
+
+ //pure textures (shader ones are done)
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ if ( *( pk3Shaders + i*65 ) != '\0' ){
+ if ( strchr( pk3Shaders + i*65, '\\') != NULL ){
+ Sys_Printf( "WARNING2: %s : bsp shader path with backslash\n", pk3Shaders + i*65 );
+ FixDOSName( pk3Shaders + i*65 );
+ //what if theres properly slashed one in the list?
+ for ( j = 0; j < pk3ShadersN; j++ ){
- if ( !stricmp( pk3Shaders + i*65, pk3Shaders + j*65 ) && (i != j) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, pk3Shaders + j*65 ) && (i != j) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ }
+ if ( *( pk3Shaders + i*65 ) == '\0' ) continue;
+ for ( j = 0; j < pk3TexturesN; j++ ){
- if ( !stricmp( pk3Shaders + i*65, pk3Textures + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, pk3Textures + j*65 ) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ if ( *( pk3Shaders + i*65 ) == '\0' ) continue;
+ for ( j = 0; j < ExTexturesN; j++ ){
- if ( !stricmp( pk3Shaders + i*65, ExTextures + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, ExTextures + j*65 ) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ if ( *( pk3Shaders + i*65 ) == '\0' ) continue;
+ for ( j = 0; j < rExTexturesN; j++ ){
- if ( !stricmp( pk3Shaders + i*65, rExTextures + j*65 ) ){
++ if ( !Q_stricmp( pk3Shaders + i*65, rExTextures + j*65 ) ){
+ *( pk3Shaders + i*65 ) = '\0';
+ break;
+ }
+ }
+ }
+ }
+
+ //snds
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ for ( j = 0; j < ExSoundsN; j++ ){
- if ( !stricmp( pk3Sounds + i*65, ExSounds + j*65 ) ){
++ if ( !Q_stricmp( pk3Sounds + i*65, ExSounds + j*65 ) ){
+ *( pk3Sounds + i*65 ) = '\0';
+ break;
+ }
+ }
+ if ( *( pk3Sounds + i*65 ) == '\0' ) continue;
+ for ( j = 0; j < rExSoundsN; j++ ){
- if ( !stricmp( pk3Sounds + i*65, rExSounds + j*65 ) ){
++ if ( !Q_stricmp( pk3Sounds + i*65, rExSounds + j*65 ) ){
+ *( pk3Sounds + i*65 ) = '\0';
+ break;
+ }
+ }
+ }
+
+ /* write shader */
+ sprintf( temp, "%s/%s_strippedBYrepacker.shader", EnginePath, nameOFrepack );
+ FILE *f;
+ f = fopen( temp, "wb" );
+ fwrite( allShaders, sizeof( char ), strlen( allShaders ), f );
+ fclose( f );
+ Sys_Printf( "Shaders saved to %s\n", temp );
+
+ /* make a pack */
+ sprintf( packname, "%s/%s_repacked.pk3", EnginePath, nameOFrepack );
+ remove( packname );
+
+ Sys_Printf( "\n--- ZipZip ---\n" );
+
+ Sys_Printf( "\n\tShader referenced textures....\n" );
+
+ for ( i = 0; i < pk3TexturesN; i++ ){
+ if ( png ){
+ sprintf( temp, "%s.png", pk3Textures + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ }
+ sprintf( temp, "%s.tga", pk3Textures + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ sprintf( temp, "%s.jpg", pk3Textures + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Textures + i*65 );
+ }
+
+ Sys_Printf( "\n\tPure textures....\n" );
+
+ for ( i = 0; i < pk3ShadersN; i++ ){
+ if ( *( pk3Shaders + i*65 ) != '\0' ){
+ if ( png ){
+ sprintf( temp, "%s.png", pk3Shaders + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ }
+ sprintf( temp, "%s.tga", pk3Shaders + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ sprintf( temp, "%s.jpg", pk3Shaders + i*65 );
+ if ( vfsPackFile( temp, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", temp );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Shaders + i*65 );
+ }
+ }
+
+ Sys_Printf( "\n\tSounds....\n" );
+
+ for ( i = 0; i < pk3SoundsN; i++ ){
+ if ( *( pk3Sounds + i*65 ) != '\0' ){
+ if ( vfsPackFile( pk3Sounds + i*65, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", pk3Sounds + i*65 );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Sounds + i*65 );
+ }
+ }
+
+ Sys_Printf( "\n\tVideos....\n" );
+
+ for ( i = 0; i < pk3VideosN; i++ ){
+ if ( vfsPackFile( pk3Videos + i*65, packname, compLevel ) ){
+ Sys_Printf( "++%s\n", pk3Videos + i*65 );
+ continue;
+ }
+ Sys_Printf( " !FAIL! %s\n", pk3Videos + i*65 );
+ }
+
+ Sys_Printf( "\nSaved to %s\n", packname );
+
+ /* return to sender */
+ return 0;
+ }
+
+
+
-/*
- PseudoCompileBSP()
- a stripped down ProcessModels
- */
-void PseudoCompileBSP( qboolean need_tree ){
- int models;
- char modelValue[10];
- entity_t *entity;
- face_t *faces;
- tree_t *tree;
- node_t *node;
- brush_t *brush;
- side_t *side;
- int i;
-
- SetDrawSurfacesBuffer();
- mapDrawSurfs = safe_malloc( sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
- memset( mapDrawSurfs, 0, sizeof( mapDrawSurface_t ) * MAX_MAP_DRAW_SURFS );
- numMapDrawSurfs = 0;
-
- BeginBSPFile();
- models = 1;
- for ( mapEntityNum = 0; mapEntityNum < numEntities; mapEntityNum++ )
- {
- /* get entity */
- entity = &entities[ mapEntityNum ];
- if ( entity->brushes == NULL && entity->patches == NULL ) {
- continue;
- }
-
- if ( mapEntityNum != 0 ) {
- sprintf( modelValue, "*%d", models++ );
- SetKeyValue( entity, "model", modelValue );
- }
-
- /* process the model */
- Sys_FPrintf( SYS_VRB, "############### model %i ###############\n", numBSPModels );
- BeginModel();
-
- entity->firstDrawSurf = numMapDrawSurfs;
-
- ClearMetaTriangles();
- PatchMapDrawSurfs( entity );
-
- if ( mapEntityNum == 0 && need_tree ) {
- faces = MakeStructuralBSPFaceList( entities[0].brushes );
- tree = FaceBSP( faces );
- node = tree->headnode;
- }
- else
- {
- node = AllocNode();
- node->planenum = PLANENUM_LEAF;
- tree = AllocTree();
- tree->headnode = node;
- }
-
- /* a minimized ClipSidesIntoTree */
- for ( brush = entity->brushes; brush; brush = brush->next )
- {
- /* walk the brush sides */
- for ( i = 0; i < brush->numsides; i++ )
- {
- /* get side */
- side = &brush->sides[ i ];
- if ( side->winding == NULL ) {
- continue;
- }
- /* shader? */
- if ( side->shaderInfo == NULL ) {
- continue;
- }
- /* save this winding as a visible surface */
- DrawSurfaceForSide( entity, brush, side, side->winding );
- }
- }
-
- if ( meta ) {
- ClassifyEntitySurfaces( entity );
- MakeEntityDecals( entity );
- MakeEntityMetaTriangles( entity );
- SmoothMetaTriangles();
- MergeMetaTriangles();
- }
- FilterDrawsurfsIntoTree( entity, tree );
-
- FilterStructuralBrushesIntoTree( entity, tree );
- FilterDetailBrushesIntoTree( entity, tree );
-
- EmitBrushes( entity->brushes, &entity->firstBrush, &entity->numBrushes );
- EndModel( entity, node );
- }
- EndBSPFile( qfalse );
-}
-
-/*
- ConvertBSPMain()
- 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;
-
-
- /* set default */
- convertFunc = ConvertBSPToASE;
- convertGame = NULL;
- map_allowed = qfalse;
- force_bsp = qfalse;
- force_map = qfalse;
-
- /* arg checking */
- if ( argc < 1 ) {
- Sys_Printf( "Usage: q3map -convert [-format <ase|obj|map_bp|map>] [-shadersasbitmap|-lightmapsastexcoord|-deluxemapsastexcoord] [-readbsp|-readmap [-meta|-patchmeta]] [-v] <mapname>\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;
- map_allowed = qfalse;
- }
- else if ( !Q_stricmp( argv[ i ], "obj" ) ) {
- convertFunc = ConvertBSPToOBJ;
- map_allowed = qfalse;
- }
- else if ( !Q_stricmp( argv[ i ], "map_bp" ) ) {
- convertFunc = ConvertBSPToMap_BP;
- map_allowed = qtrue;
- }
- else if ( !Q_stricmp( argv[ i ], "map" ) ) {
- convertFunc = ConvertBSPToMap;
- map_allowed = qtrue;
- }
- else
- {
- convertGame = GetGame( argv[ i ] );
- map_allowed = qfalse;
- if ( convertGame == NULL ) {
- Sys_Printf( "Unknown conversion format \"%s\". Defaulting to ASE.\n", argv[ i ] );
- }
- }
- }
- else if ( !strcmp( argv[ i ], "-ne" ) ) {
- normalEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Normal epsilon set to %f\n", normalEpsilon );
- }
- else if ( !strcmp( argv[ i ], "-de" ) ) {
- distanceEpsilon = atof( argv[ i + 1 ] );
- i++;
- Sys_Printf( "Distance epsilon set to %f\n", distanceEpsilon );
- }
- else if ( !strcmp( argv[ i ], "-shaderasbitmap" ) || !strcmp( argv[ i ], "-shadersasbitmap" ) ) {
- shadersAsBitmap = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-lightmapastexcoord" ) || !strcmp( argv[ i ], "-lightmapsastexcoord" ) ) {
- lightmapsAsTexcoord = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-deluxemapastexcoord" ) || !strcmp( argv[ i ], "-deluxemapsastexcoord" ) ) {
- lightmapsAsTexcoord = qtrue;
- deluxemap = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-readbsp" ) ) {
- force_bsp = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-readmap" ) ) {
- force_map = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-meta" ) ) {
- meta = qtrue;
- }
- else if ( !strcmp( argv[ i ], "-patchmeta" ) ) {
- meta = qtrue;
- patchMeta = qtrue;
- }
- }
-
- LoadShaderInfo();
-
- /* clean up map name */
- strcpy( source, ExpandArg( argv[i] ) );
- ExtractFileExtension( source, ext );
-
- if ( !map_allowed && !force_map ) {
- force_bsp = qtrue;
- }
-
- 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;
-
- /* 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;
+
+
+ /* 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++ )
+ {
++ /* -help */
++ if ( !strcmp( argv[ i ], "-h" ) || !strcmp( argv[ i ], "--help" )
++ || !strcmp( argv[ i ], "-help" ) ) {
++ HelpMain(argv[i+1]);
++ return 0;
++ }
++
+ /* -connect */
+ if ( !strcmp( argv[ i ], "-connect" ) ) {
+ argv[ i ] = NULL;
+ i++;
+ Broadcast_Setup( argv[ i ] );
+ argv[ i ] = NULL;
+ }
+
+ /* verbose */
+ else if ( !strcmp( argv[ i ], "-v" ) ) {
+ if ( !verbose ) {
+ verbose = qtrue;
+ argv[ i ] = NULL;
+ }
+ }
+
+ /* 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" ) ) {
+ argv[ i ] = NULL;
+ i++;
+ patchSubdivisions = atoi( argv[ i ] );
+ argv[ i ] = NULL;
+ if ( patchSubdivisions <= 0 ) {
+ patchSubdivisions = 1;
+ }
+ }
+
+ /* 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 );
+ PicoSetFreeFunc( free );
+ PicoSetPrintFunc( PicoPrintFunc );
+ PicoSetLoadFileFunc( PicoLoadFileFunc );
+ PicoSetFreeFileFunc( free );
+
+ /* set number of threads */
+ ThreadSetDefault();
+
+ /* generate sinusoid jitter table */
+ 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 ) {
+ patchSubdivisions = game->patchSubdivisions;
+ }
+
+ /* check if we have enough options left to attempt something */
+ if ( argc < 2 ) {
+ Error( "Usage: %s [general options] [options] mapfile", argv[ 0 ] );
+ }
+
+ /* 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 */
+ else if ( !strcmp( argv[ 1 ], "-vis" ) ) {
+ r = VisMain( argc - 1, argv + 1 );
}
/* light */
projects / xonotic / netradiant.git / commitdiff