quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* no shaderlist.txt or empty one = load all shaders

Browse Source
This commit is contained in:
Garux 2020-10-25 09:07:29 +03:00
parent a5be520748
commit af71efc0e6
2 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/shaders/shaders.cpp
View File

@ -1676,7 +1676,13 @@ void Shaders_Load(){
} }
GlobalFileSystem().forEachArchive( AddShaderListFromArchiveCaller(), false, true ); GlobalFileSystem().forEachArchive( AddShaderListFromArchiveCaller(), false, true );
DumpUnreferencedShaders(); if( l_shaderfiles != nullptr ){
DumpUnreferencedShaders();
}
else{
globalOutputStream() << "No shaderlist.txt found: loading all shaders\n";
GlobalFileSystem().forEachFile( path.c_str(), g_shadersExtension, AddShaderFileCaller(), 1 );
}
} }
else else
{ {

55
tools/quake3/q3map2/shaders.c
View File

@ -2053,6 +2053,33 @@ static void ParseCustomInfoParms( void ){
#define MAX_SHADER_FILES 1024
typedef struct StrList_s
{
int n;
char* s[MAX_SHADER_FILES];
}
StrList;
void pushShaderCallback( StrList* list, const char* string ){
char* shader = copystring( string );
strClear( shader + strlen( shader ) - strlen( ".shader" ) );
/* check for duplicate entries */
for ( int i = 0; i < list->n; i++ )
if ( striEqual( list->s[ i ], shader ) ){
free( shader );
return;
}
/* test limit */
if ( list->n >= MAX_SHADER_FILES )
Error( "MAX_SHADER_FILES (%d) reached!", (int) MAX_SHADER_FILES );
/* new shader file */
list->s[ list->n++ ] = shader;
}
/* /*
LoadShaderInfo() LoadShaderInfo()
the shaders are parsed out of shaderlist.txt from a main directory the shaders are parsed out of shaderlist.txt from a main directory
@ -2060,12 +2087,10 @@ static void ParseCustomInfoParms( void ){
on linux there's an additional twist, we actually merge the stuff from ~/.q3a/ and from the base dir on linux there's an additional twist, we actually merge the stuff from ~/.q3a/ and from the base dir
*/ */
#define MAX_SHADER_FILES 1024
void LoadShaderInfo( void ){ void LoadShaderInfo( void ){
int i, j, numShaderFiles, count; int i, j, count;
char filename[ 1024 ]; char filename[ 1024 ];
char *shaderFiles[ MAX_SHADER_FILES ]; StrList shaderFiles = { .n = 0 };
/* rr2do2: parse custom infoparms first */ /* rr2do2: parse custom infoparms first */
@ -2073,9 +2098,6 @@ void LoadShaderInfo( void ){
ParseCustomInfoParms(); ParseCustomInfoParms();
} }
/* start with zero */
numShaderFiles = 0;
/* we can pile up several shader files, the one in baseq3 and ones in the mod dir or other spots */ /* we can pile up several shader files, the one in baseq3 and ones in the mod dir or other spots */
sprintf( filename, "%s/shaderlist.txt", game->shaderPath ); sprintf( filename, "%s/shaderlist.txt", game->shaderPath );
count = vfsGetFileCount( filename ); count = vfsGetFileCount( filename );
@ -2091,8 +2113,8 @@ void LoadShaderInfo( void ){
while ( GetToken( true ) ) while ( GetToken( true ) )
{ {
/* check for duplicate entries */ /* check for duplicate entries */
for ( j = 0; j < numShaderFiles; j++ ) for ( j = 0; j < shaderFiles.n; j++ )
if ( strEqual( shaderFiles[ j ], token ) ) { if ( strEqual( shaderFiles.s[ j ], token ) ) {
break; break;
} }
@ -2102,18 +2124,23 @@ void LoadShaderInfo( void ){
} }
/* new shader file */ /* new shader file */
if ( j == numShaderFiles ) { if ( j == shaderFiles.n ) {
shaderFiles[ numShaderFiles++ ] = copystring( token ); shaderFiles.s[ shaderFiles.n++ ] = copystring( token );
} }
} }
} }
if( shaderFiles.n == 0 ){
Sys_Printf( "%s", "No shaderlist.txt found: loading all shaders\n" );
vfsListShaderFiles( &shaderFiles, pushShaderCallback );
}
/* parse the shader files */ /* parse the shader files */
for ( i = 0; i < numShaderFiles; i++ ) for ( i = 0; i < shaderFiles.n; i++ )
{ {
sprintf( filename, "%s/%s.shader", game->shaderPath, shaderFiles[ i ] ); sprintf( filename, "%s/%s.shader", game->shaderPath, shaderFiles.s[ i ] );
ParseShaderFile( filename ); ParseShaderFile( filename );
free( shaderFiles[ i ] ); free( shaderFiles.s[ i ] );
} }
/* emit some statistics */ /* emit some statistics */