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

* support misc_model::_remap facility of q3map2

Browse Source 
q3map2: fix inconsistency, introduced in d92c32d453
(_remap result could depend on _remap keys order, e.g. remapping src: moo/rock, moo/sand-rock by: rock, sand-rock suffix matches; rock could be used for moo/sand-rock)
This commit is contained in:
Garux
2020-03-25 11:53:14 +03:00
parent fbbbd2e7d7
commit 7fd32180e2
2 changed files with 117 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,12 +218,11 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
shaderInfo_t *si;
mapDrawSurface_t *ds;
bspDrawVert_t *dv;
char *picoShaderName;
const char *picoShaderName;
char shaderName[ MAX_QPATH ];
picoVec_t *xyz, *normal, *st;
byte *color;
picoIndex_t *indexes;
remap_t *rm, *rmto, *glob;
skinfile_t *sf, *sf2;
char skinfilename[ MAX_QPATH ];
char *skinfilecontent;
@@ -371,26 +370,24 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap
}
/* handle shader remapping */
glob = rmto = NULL;
for ( rm = remap; rm != NULL; rm = rm->next )
{
if ( strEqual( rm->from, "*" ) ) {
glob = rm;
const char* to = NULL;
size_t fromlen = 0;
for ( remap_t *rm = remap; rm != NULL; rm = rm->next )
{
if ( strEqual( rm->from, "*" ) && fromlen == 0 ) { // only globbing, if no respective match
to = rm->to;
}
else if( striEqualSuffix( picoShaderName, rm->from ) && strlen( rm->from ) > fromlen ){ // longer match has priority
to = rm->to;
fromlen = strlen( rm->from );
}
}
else if( striEqualSuffix( picoShaderName, rm->from ) ){
rmto = rm;
if( striEqual( picoShaderName, rm->from ) ) // exact match priority
break;
if( to != NULL ){
Sys_FPrintf( SYS_VRB, ( fromlen == 0? "Globbing '%s' to '%s'\n" : "Remapping '%s' to '%s'\n" ), picoShaderName, to );
picoShaderName = to;
}
}
if( rmto != NULL ){
Sys_FPrintf( SYS_VRB, "Remapping '%s' to '%s'\n", picoShaderName, rmto->to );
picoShaderName = rmto->to;
}
else if ( glob != NULL ) {
Sys_FPrintf( SYS_VRB, "Globbing '%s' to '%s'\n", picoShaderName, glob->to );
picoShaderName = glob->to;
}
/* shader renaming for sof2 */
if ( renameModelShaders ) {