From daea7eb81791e51cb87534dcc627cbe012104f5d Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 3 Aug 2015 18:36:59 +0200 Subject: [PATCH] Also include DarkPlaces texture names in the diffuse map filtering. --- libs/shaderlib.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/libs/shaderlib.h b/libs/shaderlib.h index c4e5ba3b..54057ac0 100644 --- a/libs/shaderlib.h +++ b/libs/shaderlib.h @@ -51,13 +51,24 @@ bool operator()( const CopiedString& shader, const CopiedString& other ) const { }; static inline bool shader_is_diffuse( const char *shader ){ - return !string_equal_suffix( shader, "_bump" ) - && !string_equal_suffix( shader, "_glow" ) - && !string_equal_suffix( shader, "_h" ) - && !string_equal_suffix( shader, "_local" ) - && !string_equal_suffix( shader, "_luma" ) - && !string_equal_suffix( shader, "_nm" ) - && !string_equal_suffix( shader, "_s" ); + return + /* Quake2World */ + !string_equal_suffix( shader, "_bump" ) + && !string_equal_suffix( shader, "_glow" ) + && !string_equal_suffix( shader, "_h" ) + && !string_equal_suffix( shader, "_local" ) + && !string_equal_suffix( shader, "_luma" ) + && !string_equal_suffix( shader, "_nm" ) + && !string_equal_suffix( shader, "_s" ) + /* DarkPlaces */ + && !string_equal_suffix( shader, "_norm" ) + // (already in Quake2World) && !string_equal_suffix( shader, "_bump" ) + // (already in Quake2World) && !string_equal_suffix( shader, "_glow" ) + && !string_equal_suffix( shader, "_gloss" ) + && !string_equal_suffix( shader, "_pants" ) + && !string_equal_suffix( shader, "_shirt" ) + && !string_equal_suffix( shader, "_reflect" ) + ; } inline bool shader_valid( const char* shader ){ -- 2.39.2