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

more PathExtensionless use

Browse Source
This commit is contained in:
Garux 2021-02-07 07:18:10 +03:00
parent 5fd7b340df
commit 54f7daa887
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/quake3/q3map2/shaders.cpp
View File

@ -1051,8 +1051,7 @@ static void ParseShaderFile( const char *filename ){
/* get an image */ /* get an image */
GetTokenAppend( shaderText, false ); GetTokenAppend( shaderText, false );
if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) { if ( token[ 0 ] != '*' && token[ 0 ] != '$' ) {
StripExtension( token ); si->lightImagePath( PathExtensionless( token ) );
si->lightImagePath = token;
/* debug code */ /* debug code */
//% Sys_FPrintf( SYS_VRB, "Deduced shader image: %s\n", si->lightImagePath ); //% Sys_FPrintf( SYS_VRB, "Deduced shader image: %s\n", si->lightImagePath );
@ -1204,22 +1203,19 @@ static void ParseShaderFile( const char *filename ){
/* qer_editorimage <image> */ /* qer_editorimage <image> */
else if ( striEqual( token, "qer_editorImage" ) ) { else if ( striEqual( token, "qer_editorImage" ) ) {
GetTokenAppend( shaderText, false ); GetTokenAppend( shaderText, false );
StripExtension( token ); si->editorImagePath( PathExtensionless( token ) );
si->editorImagePath = token;
} }
/* ydnar: q3map_normalimage <image> (bumpmapping normal map) */ /* ydnar: q3map_normalimage <image> (bumpmapping normal map) */
else if ( striEqual( token, "q3map_normalImage" ) ) { else if ( striEqual( token, "q3map_normalImage" ) ) {
GetTokenAppend( shaderText, false ); GetTokenAppend( shaderText, false );
StripExtension( token ); si->normalImagePath( PathExtensionless( token ) );
si->normalImagePath = token;
} }
/* q3map_lightimage <image> */ /* q3map_lightimage <image> */
else if ( striEqual( token, "q3map_lightImage" ) ) { else if ( striEqual( token, "q3map_lightImage" ) ) {
GetTokenAppend( shaderText, false ); GetTokenAppend( shaderText, false );
StripExtension( token ); si->lightImagePath( PathExtensionless( token ) );
si->lightImagePath = token;
} }
/* ydnar: skyparms <outer image> <cloud height> <inner image> */ /* ydnar: skyparms <outer image> <cloud height> <inner image> */