Also include DarkPlaces texture names in the diffuse map filtering. xonotic-v0.8.1
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:36:59 +0000 (18:36 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 3 Aug 2015 16:36:59 +0000 (18:36 +0200)
libs/shaderlib.h

index c4e5ba3..54057ac 100644 (file)
@@ -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 ){