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

q3map2 * misc_model::_remap: also remap 'abrakadabraNAME' shaders by _remap = 'NAME;newname'

Browse Source 
exact match has priority over this
This commit is contained in:
Garux 2019-11-11 01:14:10 +03:00
parent c0b5454fd8
commit d92c32d453
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/quake3/q3map2/model.c
View File

@ -223,7 +223,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
picoVec_t *xyz, *normal, *st; picoVec_t *xyz, *normal, *st;
byte *color; byte *color;
picoIndex_t *indexes; picoIndex_t *indexes;
remap_t *rm, *glob; remap_t *rm, *rmto, *glob;
skinfile_t *sf, *sf2; skinfile_t *sf, *sf2;
char skinfilename[ MAX_QPATH ]; char skinfilename[ MAX_QPATH ];
char *skinfilecontent; char *skinfilecontent;
@ -372,22 +372,28 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
} }
/* handle shader remapping */ /* handle shader remapping */
glob = NULL; glob = rmto = NULL;
for ( rm = remap; rm != NULL; rm = rm->next ) for ( rm = remap; rm != NULL; rm = rm->next )
{ {
if ( rm->from[ 0 ] == '*' && rm->from[ 1 ] == '\0' ) { if ( rm->from[ 0 ] == '*' && rm->from[ 1 ] == '\0' ) {
glob = rm; glob = rm;
} }
else if ( !Q_stricmp( picoShaderName, rm->from ) ) { else{
Sys_FPrintf( SYS_VRB, "Remapping %s to %s\n", picoShaderName, rm->to ); const size_t shaderLen = strlen( picoShaderName );
picoShaderName = rm->to; const size_t suffixLen = strlen( rm->from );
glob = NULL; if( shaderLen >= suffixLen && !Q_strncasecmp( picoShaderName + shaderLen - suffixLen, rm->from, suffixLen ) ){
break; rmto = rm;
if( shaderLen == suffixLen ) // exact match priority
break;
}
} }
} }
if( rmto ){
if ( glob != NULL ) { Sys_FPrintf( SYS_VRB, "Remapping '%s' to '%s'\n", picoShaderName, rmto->to );
Sys_FPrintf( SYS_VRB, "Globbing %s to %s\n", picoShaderName, glob->to ); picoShaderName = rmto->to;
}
else if ( glob ) {
Sys_FPrintf( SYS_VRB, "Globbing '%s' to '%s'\n", picoShaderName, glob->to );
picoShaderName = glob->to; picoShaderName = glob->to;
} }