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

* model shader paths guessings: use material names, starting with textures/ or models/ as is

Browse Source 
so materials named intentionally as ingame shaders shall work as expected
This commit is contained in:
Garux 2021-12-16 03:06:30 +03:00
parent d888d2622d
commit 1bd3e7ae18
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/assmodel/model.cpp
View File

@ -234,9 +234,13 @@ private:
#ifdef _DEBUG #ifdef _DEBUG
globalOutputStream() << "matname: " << matname.C_Str() << "\n"; globalOutputStream() << "matname: " << matname.C_Str() << "\n";
#endif #endif
aiString texname; if( aiString texname;
if( aiReturn_SUCCESS == material->Get( AI_MATKEY_TEXTURE_DIFFUSE(0), texname ) aiReturn_SUCCESS == material->Get( AI_MATKEY_TEXTURE_DIFFUSE(0), texname )
&& texname.length != 0 ){ && texname.length != 0
&& !string_equal_prefix_nocase( matname.C_Str(), "textures/" ) /* matname looks intentionally named as ingame shader */
&& !string_equal_prefix_nocase( matname.C_Str(), "textures\"" )
&& !string_equal_prefix_nocase( matname.C_Str(), "models/" )
&& !string_equal_prefix_nocase( matname.C_Str(), "models\"" ) ){
#ifdef _DEBUG #ifdef _DEBUG
globalOutputStream() << "texname: " << texname.C_Str() << "\n"; globalOutputStream() << "texname: " << texname.C_Str() << "\n";
#endif #endif

10
tools/quake3/q3map2/model.cpp
View File

@ -202,9 +202,13 @@ struct AssModel
#ifdef _DEBUG #ifdef _DEBUG
Sys_Printf( "matname: %s\n", matname.C_Str() ); Sys_Printf( "matname: %s\n", matname.C_Str() );
#endif #endif
aiString texname; if( aiString texname;
if( aiReturn_SUCCESS == material->Get( AI_MATKEY_TEXTURE_DIFFUSE(0), texname ) aiReturn_SUCCESS == material->Get( AI_MATKEY_TEXTURE_DIFFUSE(0), texname )
&& texname.length != 0 ){ && texname.length != 0
&& !string_equal_prefix_nocase( matname.C_Str(), "textures/" ) /* matname looks intentionally named as ingame shader */
&& !string_equal_prefix_nocase( matname.C_Str(), "textures\"" )
&& !string_equal_prefix_nocase( matname.C_Str(), "models/" )
&& !string_equal_prefix_nocase( matname.C_Str(), "models\"" ) ){
#ifdef _DEBUG #ifdef _DEBUG
Sys_Printf( "texname: %s\n", texname.C_Str() ); Sys_Printf( "texname: %s\n", texname.C_Str() );
#endif #endif