int ShiftBSPMain( int argc, char **argv ){
int i, j;
- float f, a;
vec3_t scale;
vec3_t vec;
char str[ 1024 ];
- int uniform, axis;
- qboolean texscale;
- float *old_xyzst = NULL;
float spawn_ref = 0;
return 0;
}
- texscale = qfalse;
for ( i = 1; i < argc - 2; ++i )
{
if ( !strcmp( argv[i], "-tex" ) ) {
- texscale = qtrue;
}
else if ( !strcmp( argv[i], "-spawn_ref" ) ) {
spawn_ref = atof( argv[i + 1] );
scale[0] = atof( argv[ argc - 4 ] );
}
- uniform = ( ( scale[0] == scale[1] ) && ( scale[1] == scale[2] ) );
-
/* do some path mangling */
strcpy( source, ExpandArg( argv[ argc - 1 ] ) );
/* 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;
}
+ /* 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 ( 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 ( !Q_stricmp( texlist + i*65, texlist + (*texnum)*65 ) ) return;
+ }
+ for ( i = 0; i < *EXtexnum; i++ ){
+ 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 ( !Q_stricmp( data[i], data[*num] ) ) return;
for ( i = 0; i < pk3ShaderfilesN; i++ ){
qboolean wantShader = qfalse, wantShaderFile = qfalse, ShaderFileExcluded = qfalse;
int shader;
- char* reasonShader = NULL, reasonShaderFile = NULL;
+ char* reasonShader = NULL;
+ char* reasonShaderFile = NULL;
/* load the shader */
sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles + i*65 );
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 ( !Q_stricmp( pk3Videos + j*65, token ) ){
goto away;
for ( i = 0; i < pk3TexturesN; i++ ){
if ( png ){
sprintf( temp, "%s.png", pk3Textures + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
}
sprintf( temp, "%s.tga", pk3Textures + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
sprintf( temp, "%s.jpg", pk3Textures + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
if ( *( pk3Shaders + i*65 ) != '\0' ){
if ( png ){
sprintf( temp, "%s.png", pk3Shaders + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
}
sprintf( temp, "%s.tga", pk3Shaders + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
sprintf( temp, "%s.jpg", pk3Shaders + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
for ( i = 0; i < pk3ShaderfilesN; i++ ){
if ( *( pk3Shaderfiles + i*65 ) != '\0' ){
sprintf( temp, "%s/%s", game->shaderPath, pk3Shaderfiles + i*65 );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
continue;
}
for ( i = 0; i < pk3SoundsN; i++ ){
if ( *( pk3Sounds + i*65 ) != '\0' ){
- if ( vfsPackFile( pk3Sounds + i*65, packname ) ){
+ if ( vfsPackFile( pk3Sounds + i*65, packname, 10 ) ){
Sys_Printf( "++%s\n", pk3Sounds + i*65 );
continue;
}
Sys_Printf( "\n\tVideos....\n" );
for ( i = 0; i < pk3VideosN; i++ ){
- if ( vfsPackFile( pk3Videos + i*65, packname ) ){
+ if ( vfsPackFile( pk3Videos + i*65, packname, 10 ) ){
Sys_Printf( "++%s\n", pk3Videos + i*65 );
continue;
}
Sys_Printf( "\n\t.bsp and stuff\n" );
sprintf( temp, "maps/%s.bsp", nameOFmap );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
}
else{
}
sprintf( temp, "maps/%s.aas", nameOFmap );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
}
else{
}
sprintf( temp, "scripts/%s.arena", nameOFmap );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
}
else{
}
sprintf( temp, "scripts/%s.defi", nameOFmap );
- if ( vfsPackFile( temp, packname ) ){
+ if ( vfsPackFile( temp, packname, 10 ) ){
Sys_Printf( "++%s\n", temp );
}
else{
/*
- 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( ( i + 1 < argc ) ? argv[ i + 1 ] : NULL );
- return 0;
+ /* test for end of file */
+ if ( !GetToken( qtrue ) ) {
+ break;
}
- /* -connect */
- if ( !strcmp( argv[ i ], "-connect" ) ) {
- if ( ++i >= argc || !argv[ i ] ) {
- Error( "Out of arguments: No address specified after %s", argv[ i - 1 ] );
- }
- argv[ i - 1 ] = NULL;
- Broadcast_Setup( argv[ i ] );
- argv[ i ] = NULL;
+ /* blocks */
+ 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 ( !Q_stricmp( token, "shaders" ) ){
+ parseEXblock ( ExShaders, &ExShadersN, exName );
}
-
- /* force */
- else if ( !strcmp( argv[ i ], "-force" ) ) {
- force = qtrue;
- argv[ i ] = NULL;
+ 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 ( !Q_stricmp( token, "sounds" ) ){
+ parseEXblock ( ExSounds, &ExSoundsN, exName );
}
-
- /* patch subdivisions */
- else if ( !strcmp( argv[ i ], "-subdivisions" ) ) {
- if ( ++i >= argc || !argv[ i ] ) {
- Error( "Out of arguments: No value specified after %s", argv[ i - 1 ] );
- }
- argv[ i - 1 ] = NULL;
- patchSubdivisions = atoi( argv[ i ] );
- argv[ i ] = NULL;
- if ( patchSubdivisions <= 0 ) {
- patchSubdivisions = 1;
- }
+ else if ( !Q_stricmp( token, "videos" ) ){
+ parseEXblock ( ExVideos, &ExVideosN, exName );
+ }
+ else{
+ Error( "ReadExclusionsFile: %s, line %d: unknown block name!\nValid ones are: textures, shaders, shaderfiles, sounds, videos.", exName, scriptline );
}
+ }
- /* threads */
- else if ( !strcmp( argv[ i ], "-threads" ) ) {
- if ( ++i >= argc || !argv[ i ] ) {
- Error( "Out of arguments: No value specified after %s", argv[ i - 1 ] );
+ /* free the buffer */
+ free( buffer );
+
+ for ( i = 0; i < ExTexturesN; i++ ){
+ for ( j = 0; j < ExShadersN; j++ ){
+ if ( !Q_stricmp( ExTextures + i*65, ExShaders + j*65 ) ){
+ break;
}
- argv[ i - 1 ] = NULL;
- numthreads = atoi( argv[ i ] );
- argv[ i ] = NULL;
}
-
- else if( !strcmp( argv[ i ], "-nocmdline" ) )
- {
- Sys_Printf( "noCmdLine\n" );
- nocmdline = qtrue;
- argv[ i ] = NULL;
+ 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( RADIANT_NAME " - 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 ( !Q_stricmp( token, "textures" ) ){
+ parseEXblock ( rExTextures, &rExTexturesN, exName );
+ }
+ else if ( !Q_stricmp( token, "shaders" ) ){
+ parseEXblock ( rExShaders, &rExShadersN, exName );
+ }
+ else if ( !Q_stricmp( token, "shaderfiles" ) ){
+ parseEXblock ( rExShaderfiles, &rExShaderfilesN, exName );
+ }
+ else if ( !Q_stricmp( token, "sounds" ) ){
+ parseEXblock ( rExSounds, &rExSoundsN, exName );
+ }
+ 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 );
+ }
+ }
+
+ /* 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 ( !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 ( !!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 ( !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 ( !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 ( !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 ( !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 ( !Q_stricmp( pk3Shaders + j*65, token) ){
+ shader = j;
+ wantShader = qtrue;
+ break;
+ }
+ }
+ if ( wantShader ){
+ for ( j = 0; j < rExTexturesN ; j++ ){
+ 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 ( !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 ( !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 ( !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 ( !Q_stricmp( pk3Videos + j*65, token ) ){
+ goto away;
+ }
+ }
+ for ( j = 0; j < ExVideosN; j++ ){
+ if ( !Q_stricmp( ExVideos + j*65, token ) ){
+ goto away;
+ }
+ }
+ for ( j = 0; j < rExVideosN; j++ ){
+ if ( !Q_stricmp( rExVideos + j*65, token ) ){
+ goto away;
+ }
+ }
+ strcpy ( pk3Videos + pk3VideosN*65, token );
+ pk3VideosN++;
+ away:
+ j = 0;
+ }
+ 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 ( !Q_stricmp( token, "surfaceparm" ) ) {
+ strcat( shaderText, "\n\tsurfaceparm " );
+ GetToken( qfalse );
+ strcat( shaderText, token );
+ if ( !Q_stricmp( token, "nodraw" ) ) {
+ wantShader = qfalse;
+ *( pk3Shaders + shader*65 ) = '\0';
+ }
+ }
+
+ /* skyparms <outer image> <cloud height> <inner image> */
+ else if ( !Q_stricmp( token, "skyParms" ) ) {
+ strcat( shaderText, "\n\tskyParms " );
+ hasmap = qtrue;
+ /* get image base */
+ GetToken( qfalse );
+ strcat( shaderText, token );
+
+ /* ignore bogus paths */
+ 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 ( !!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 ( !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 ( !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 ( !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 ( !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 ( !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 ( !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 ( !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 ( !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;
+ }
+
+
+
+ /*
+ 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]);
++ HelpMain( ( i + 1 < argc ) ? argv[ i + 1 ] : NULL );
+ return 0;
+ }
+
+ /* -connect */
+ if ( !strcmp( argv[ i ], "-connect" ) ) {
- argv[ i ] = NULL;
- i++;
++ if ( ++i >= argc || !argv[ i ] ) {
++ Error( "Out of arguments: No address specified after %s", argv[ i - 1 ] );
++ }
++ argv[ i - 1 ] = NULL;
+ 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++;
++ if ( ++i >= argc || !argv[ i ] ) {
++ Error( "Out of arguments: No value specified after %s", argv[ i - 1 ] );
++ }
++ argv[ i - 1 ] = NULL;
+ patchSubdivisions = atoi( argv[ i ] );
+ argv[ i ] = NULL;
+ if ( patchSubdivisions <= 0 ) {
+ patchSubdivisions = 1;
+ }
+ }
+
+ /* threads */
+ else if ( !strcmp( argv[ i ], "-threads" ) ) {
- argv[ i ] = NULL;
- i++;
++ if ( ++i >= argc || !argv[ i ] ) {
++ Error( "Out of arguments: No value specified after %s", argv[ i - 1 ] );
++ }
++ argv[ i - 1 ] = 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 */
+ 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( RADIANT_NAME " - 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 = FixAASMain( argc - 1, argv + 1 );
+ }
+
+ /* analyze */
+ else if ( !strcmp( argv[ 1 ], "-analyze" ) ) {
+ r = AnalyzeBSPMain( argc - 1, argv + 1 );
+ }
+
+ /* info */
+ else if ( !strcmp( argv[ 1 ], "-info" ) ) {
+ r = BSPInfoMain( argc - 2, argv + 2 );
}
/* vis */
r = pk3BSPMain( argc - 1, argv + 1 );
}
+ /* repacker */
+ else if ( !strcmp( argv[ 1 ], "-repack" ) ) {
+ r = repackBSPMain( argc - 1, argv + 1 );
+ }
+
/* ydnar: bsp conversion */
else if ( !strcmp( argv[ 1 ], "-convert" ) ) {
r = ConvertBSPMain( argc - 1, argv + 1 );
}
/* ydnar: otherwise create a bsp */
- else {
+ else{
+ /* used to write Smokin'Guns like tex file */
+ compile_map = qtrue;
+
r = BSPMain( argc, argv );
}
------------------------------------------------------------------------------- */
/* platform-specific */
-#if GDEF_OS_LINUX || GDEF_OS_MACOS
- #define Q_UNIX
-#endif
-
-#ifdef Q_UNIX
+#if GDEF_OS_POSIX
#include <unistd.h>
#include <pwd.h>
#include <limits.h>
/* general */
-#include "version.h" /* ttimo: might want to guard that if built outside of the GtkRadiant tree */
-
#include "cmdlib.h"
#include "mathlib.h"
#include "md5lib.h"
------------------------------------------------------------------------------- */
-#define MAC_STATIC_HACK 0
-#if GDEF_OS_MACOS && MAC_STATIC_HACK
- #define MAC_STATIC static
-#else
- #define MAC_STATIC
-#endif
-
-#if 1
#if GDEF_OS_WINDOWS
#define Q_stricmp stricmp
#define Q_strncasecmp strnicmp
#define Q_stricmp strcasecmp
#define Q_strncasecmp strncasecmp
#endif
+
+// hack to declare and define in the same file
+#ifdef MAIN_C
+ #define Q_EXTERN
+ #define Q_ASSIGN( a ) = a
+#else
+ #define Q_EXTERN extern
+ #define Q_ASSIGN( a )
#endif
/* macro version */
/* general */
#define MAX_QPATH 64
-#define MAX_IMAGES 512
+#define MAX_IMAGES 2048
#define DEFAULT_IMAGE "*default"
-#define MAX_MODELS 512
+#define MAX_MODELS 2048
#define DEF_BACKSPLASH_FRACTION 0.05f /* 5% backsplash by default */
#define DEF_BACKSPLASH_DISTANCE 23
#define C_DETAIL 0x08000000 /* THIS MUST BE THE SAME AS IN RADIANT! */
+/* new tex surface flags, like Smokin'Guns */
+#define TEX_SURF_METAL 0x00001000
+#define TEX_SURF_WOOD 0x00080000
+#define TEX_SURF_CLOTH 0x00100000
+#define TEX_SURF_DIRT 0x00200000
+#define TEX_SURF_GLASS 0x00400000
+#define TEX_SURF_PLANT 0x00800000
+#define TEX_SURF_SAND 0x01000000
+#define TEX_SURF_SNOW 0x02000000
+#define TEX_SURF_STONE 0x04000000
+#define TEX_SURF_WATER 0x08000000
+#define TEX_SURF_GRASS 0x10000000
+#define TEX_SURF_BREAKABLE 0x20000000
+
+
/* shadow flags */
#define WORLDSPAWN_CAST_SHADOWS 1
#define WORLDSPAWN_RECV_SHADOWS 1
#define HINT_PRIORITY 1000 /* ydnar: force hint splits first and antiportal/areaportal splits last */
#define ANTIPORTAL_PRIORITY -1000
#define AREAPORTAL_PRIORITY -1000
-#define DETAIL_PRIORITY -3000
+#define DETAIL_PRIORITY -3000
#define PSIDE_FRONT 1
#define PSIDE_BACK 2
#define RAD_LUXEL_SIZE 3
#define SUPER_LUXEL_SIZE 4
#define SUPER_FLAG_SIZE 4
-#define FLAG_FORCE_SUBSAMPLING 1
+#define FLAG_FORCE_SUBSAMPLING 1
#define FLAG_ALREADY_SUBSAMPLED 2
#define SUPER_ORIGIN_SIZE 3
#define SUPER_NORMAL_SIZE 4
}
miniMapMode_t;
+typedef enum
+{
+ MINIMAP_SIDECAR_NONE,
+ MINIMAP_SIDECAR_UNVANQUISHED
+}
+miniMapSidecarFormat_t;
+
typedef struct game_s
{
char *arg; /* -game matches this */
int maxLMSurfaceVerts; /* default maximum meta surface verts */
int maxSurfaceVerts; /* default maximum surface verts */
int maxSurfaceIndexes; /* default maximum surface indexes (tris * 3) */
+ qboolean texFile; /* enable per shader prefix surface flags and .tex file */
qboolean emitFlares; /* when true, emit flare surfaces */
char *flareShader; /* default flare shader (MUST BE SET) */
qboolean wolfLight; /* when true, lights work like wolf q3map */
qboolean miniMapKeepAspect; /* minimap keep aspect ratio by letterboxing */
miniMapMode_t miniMapMode; /* minimap mode */
char *miniMapNameFormat; /* minimap name format */
+ miniMapSidecarFormat_t miniMapSidecarFormat; /* minimap sidecar format */
char *bspIdent; /* 4-letter bsp file prefix */
int bspVersion; /* bsp version to use */
qboolean lumpSwap; /* cod-style len/ofs order */
struct face_s *next;
int planenum;
int priority;
- //qboolean checked;
+ //qboolean checked;
int compileFlags;
winding_t *w;
}
}
surfaceType_t;
-char *surfaceTypes[ NUM_SURFACE_TYPES ]
+Q_EXTERN char *surfaceTypes[ NUM_SURFACE_TYPES ]
#ifndef MAIN_C
;
#else
float *bspLuxels[ MAX_LIGHTMAPS ];
float *radLuxels[ MAX_LIGHTMAPS ];
float *superLuxels[ MAX_LIGHTMAPS ];
- unsigned char *superFlags;
+ unsigned char *superFlags;
float *superOrigins;
float *superNormals;
int *superClusters;
/* light_ydnar.c */
void ColorToBytes( const float *color, byte *colorBytes, float scale );
+void ColorToBytesNonZero( const float *color, byte *colorBytes, float scale );
void SmoothNormals( void );
void MapRawLightmap( int num );
void SetupSurfaceLightmaps( void );
void StitchSurfaceLightmaps( void );
-void StoreSurfaceLightmaps( qboolean fastAllocate );
+void StoreSurfaceLightmaps( qboolean fastAllocate, qboolean storeForReal );
/* exportents.c */
void AddLump( FILE *file, bspHeader_t *header, int lumpNum, const void *data, int length );
void LoadBSPFile( const char *filename );
+ void PartialLoadBSPFile( const char *filename );
void WriteBSPFile( const char *filename );
void PrintBSPFileSizes( void );
+void WriteTexFile( char *name );
+void LoadSurfaceFlags( char *filename );
+int GetSurfaceParm( const char *tex );
+void RestoreSurfaceFlags( char *filename );
+
epair_t *ParseEPair( void );
void ParseEntities( void );
void UnparseEntities( void );
/* bspfile_ibsp.c */
void LoadIBSPFile( const char *filename );
void WriteIBSPFile( const char *filename );
+ void PartialLoadIBSPFile( const char *filename );
+
/* bspfile_rbsp.c */
------------------------------------------------------------------------------- */
-#ifdef MAIN_C
- #define Q_EXTERN
- #define Q_ASSIGN( a ) = a
-#else
- #define Q_EXTERN extern
- #define Q_ASSIGN( a )
-#endif
-
/* game support */
Q_EXTERN game_t games[]
#ifndef MAIN_C
=
{
#include "game_quake3.h"
+ ,
+ #include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
+ ,
+ #include "game_oa.h" /* must be after game_quake3.h as they share defines! */
+ ,
+ #include "game_q3rally.h" /* must be after game_quake3.h as they share defines! */
,
#include "game_quakelive.h" /* must be after game_quake3.h as they share defines! */
,
- #include "game_nexuiz.h" /* must be after game_quake3.h as they share defines! */
+ #include "game_reaction.h" /* must be after game_quake3.h */
,
- #include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
+ #include "game_smokinguns.h" /* must be after game_quake3.h */
,
#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
,
#include "game_unvanquished.h" /* must be after game_tremulous.h as they share defines! */
+ ,
+ #include "game_wop.h" /* must be after game_quake3.h as they share defines! */
+ ,
+ #include "game_xonotic.h" /* must be after game_quake3.h as they share defines! */
,
#include "game_tenebrae.h"
,
,
#include "game_qfusion.h" /* qfusion game */
,
- #include "game_reaction.h" /* must be after game_quake3.h */
+ #include "game_warsow.h" /* must be after game_qfusion.h as they share defines! */
+ ,
+ #include "game_warfork.h" /* must be after game_qfusion.h as they share defines! */
,
- #include "game_darkplaces.h" /* vortex: darkplaces q1 engine */
+ #include "game_darkplaces.h" /* darkplaces q1 engine */
,
- #include "game_dq.h" /* vortex: deluxe quake game ( darkplaces q1 engine) */
+ #include "game_dq.h" /* deluxe quake game ( darkplaces q1 engine) */
,
#include "game_prophecy.h" /* vortex: prophecy game ( darkplaces q1 engine) */
,
/* commandline arguments */
Q_EXTERN qboolean nocmdline Q_ASSIGN( qfalse );
-Q_EXTERN qboolean verbose;
Q_EXTERN qboolean verboseEntities Q_ASSIGN( qfalse );
Q_EXTERN qboolean force Q_ASSIGN( qfalse );
Q_EXTERN qboolean infoMode Q_ASSIGN( qfalse );
Q_EXTERN qboolean noHint Q_ASSIGN( qfalse ); /* ydnar */
Q_EXTERN qboolean renameModelShaders Q_ASSIGN( qfalse ); /* ydnar */
Q_EXTERN qboolean skyFixHack Q_ASSIGN( qfalse ); /* ydnar */
-Q_EXTERN qboolean bspAlternateSplitWeights Q_ASSIGN( qfalse ); /* 27 */
-Q_EXTERN qboolean deepBSP Q_ASSIGN( qfalse ); /* div0 */
+Q_EXTERN qboolean bspAlternateSplitWeights Q_ASSIGN( qfalse ); /* 27 */
+Q_EXTERN qboolean deepBSP Q_ASSIGN( qfalse ); /* div0 */
Q_EXTERN qboolean maxAreaFaceSurface Q_ASSIGN( qfalse ); /* divVerent */
Q_EXTERN int patchSubdivisions Q_ASSIGN( 8 ); /* ydnar: -patchmeta subdivisions */
Q_EXTERN bspBrushSide_t* bspBrushSides Q_ASSIGN( NULL );
Q_EXTERN int numBSPLightBytes Q_ASSIGN( 0 );
-Q_EXTERN byte *bspLightBytes Q_ASSIGN( NULL );
+Q_EXTERN byte *bspLightBytes Q_ASSIGN( NULL );
//% Q_EXTERN int numBSPGridPoints Q_ASSIGN( 0 );
//% Q_EXTERN byte *bspGridPoints Q_ASSIGN( NULL );
Q_EXTERN byte bspVisBytes[ MAX_MAP_VISIBILITY ];
Q_EXTERN int numBSPDrawVerts Q_ASSIGN( 0 );
-Q_EXTERN bspDrawVert_t *bspDrawVerts Q_ASSIGN( NULL );
+Q_EXTERN bspDrawVert_t *bspDrawVerts Q_ASSIGN( NULL );
Q_EXTERN int numBSPDrawIndexes Q_ASSIGN( 0 );
Q_EXTERN int allocatedBSPDrawIndexes Q_ASSIGN( 0 );
-Q_EXTERN int *bspDrawIndexes Q_ASSIGN( NULL );
+Q_EXTERN int *bspDrawIndexes Q_ASSIGN( NULL );
Q_EXTERN int numBSPDrawSurfaces Q_ASSIGN( 0 );
Q_EXTERN bspDrawSurface_t *bspDrawSurfaces Q_ASSIGN( NULL );
Q_EXTERN int numBSPAds Q_ASSIGN( 0 );
Q_EXTERN bspAdvertisement_t bspAds[ MAX_MAP_ADVERTISEMENTS ];
-#define AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def ) \
+// Used for tex file support, Smokin'Guns globals
+Q_EXTERN qboolean compile_map;
+
+#define _AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def, fillWithZeros ) \
do \
{ \
+ int prevAllocated = allocated; \
if ( reqitem >= allocated ) \
{ \
if ( allocated == 0 ) { \
- allocated = def; } \
+ allocated = def; \
+ } \
while ( reqitem >= allocated && allocated ) \
+ { \
allocated *= 2; \
+ } \
if ( !allocated || allocated > 2147483647 / (int)sizeof( *ptr ) ) \
{ \
- Error( # ptr " over 2 GB" ); \
+ Error( #ptr " over 2 GB" ); \
} \
ptr = realloc( ptr, sizeof( *ptr ) * allocated ); \
if ( !ptr ) { \
- Error( # ptr " out of memory" ); } \
+ Error( #ptr " out of memory" ); \
+ } \
+ if ( fillWithZeros ) \
+ { \
+ memset( ptr + ( sizeof( *ptr ) * prevAllocated ), 0 , sizeof( *ptr ) * ( allocated - prevAllocated ) ); \
+ } \
} \
} \
while ( 0 )
-#define AUTOEXPAND_BY_REALLOC_BSP( suffix, def ) AUTOEXPAND_BY_REALLOC( bsp ## suffix, numBSP ## suffix, allocatedBSP ## suffix, def )
+#define AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def ) _AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def, qfalse )
+
+#define AUTOEXPAND_BY_REALLOC0( ptr, reqitem, allocated, def ) _AUTOEXPAND_BY_REALLOC( ptr, reqitem, allocated, def, qtrue )
+
+#define AUTOEXPAND_BY_REALLOC_BSP( suffix, def ) AUTOEXPAND_BY_REALLOC( bsp##suffix, numBSP##suffix, allocatedBSP##suffix, def )
+
+#define AUTOEXPAND_BY_REALLOC0_BSP( suffix, def ) AUTOEXPAND_BY_REALLOC0( bsp##suffix, numBSP##suffix, allocatedBSP##suffix, def )
#define Image_LinearFloatFromsRGBFloat( c ) ( ( ( c ) <= 0.04045f ) ? ( c ) * ( 1.0f / 12.92f ) : (float)pow( ( ( c ) + 0.055f ) * ( 1.0f / 1.055f ), 2.4f ) )
#define Image_sRGBFloatFromLinearFloat( c ) ( ( ( c ) < 0.0031308f ) ? ( c ) * 12.92f : 1.055f * (float)pow( ( c ), 1.0f / 2.4f ) - 0.055f )
projects / xonotic / netradiant.git / commitdiff