ParseShader: attempt to load extra textures the DarkPlaces way

Author: illwieckz

src/engine/renderer/tr_local.h

@@ -1076,6 +1076,11 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
 
 		bool        active;
 
+		// DarkPlaces compatibility
+		// only used to backup color map texture name
+		// to guess extra map name
+		char            textureName[ MAX_QPATH ];
+
 		textureBundle_t bundle[ MAX_TEXTURE_BUNDLES ];
 
 		expression_t    ifExp;

src/engine/renderer/tr_shader.cpp

@@ -1442,6 +1442,13 @@ static bool LoadMap( shaderStage_t *stage, const char *buffer )
 		return false;
 	}
 
+	// DarkPlaces compatibility
+	// a diffuse maps loaded without stage keyword is a color map
+	// backup texture name somewhere, its basename will be needed for extra map lookup
+	if ( stage->type == stageType_t::ST_COLORMAP ) {
+		strcpy( stage->textureName, buffer );
+	}
+
 	return true;
 }
 
@@ -3100,6 +3107,23 @@ static void ParseLightFalloffImage( shaderStage_t *stage, const char **text )
 	}
 }
 
+struct extraMapParser_t
+{
+	const char *suffix;
+	const char *description;
+	void ( *parser ) ( shaderStage_t*, const char** );
+};
+
+static const extraMapParser_t extraMapParsers[] =
+{
+	{ "_glow", "glow map", ParseGlowMap },
+	{ "_norm", "normal map", ParseNormalMap },
+	{ "_gloss", "specular map", ParseSpecularMap },
+	{ "_reflect", "reflection map", ParseReflectionMap },
+};
+
+static int numExtraMapParsers = ARRAY_LEN( extraMapParsers );
+
 /*
 =================
 ParseShader
@@ -3111,13 +3135,12 @@ will optimize it.
 */
 static bool ParseShader( const char *_text )
 {
+	int  s;
 	const char **text;
 	char *token;
-	int  s;
 
 	s = 0;
 	text = &_text;
-
 	token = COM_ParseExt2( text, true );
 
 	if ( token[ 0 ] != '{' )
@@ -3678,6 +3701,48 @@ static bool ParseShader( const char *_text )
 		}
 	}
 
+	// DarkPlaces compatibility
+	// look for extra maps based on their suffixes
+	int c;
+	shaderStage_t colorMapStage;
+
+	// pick the first color map
+	for ( c = 0; c < s; c++ ) {
+		if ( stages[ c ].type == stageType_t::ST_COLORMAP && stages[ c ].textureName[ 0 ] != '\0' ) {
+			colorMapStage = stages[ c ];
+			break;
+		}
+	}
+
+	// guess extra maps for this color map
+	if ( c < s )
+	{
+		const char *prefix; // not used but required by R_FindImageLoader
+		const char *mapName;
+		char baseName[ MAX_QPATH ];
+
+		Log::Debug( "looking for extra maps for color map: '%s'", colorMapStage.textureName );
+		COM_StripExtension3( colorMapStage.textureName, baseName, MAX_QPATH );
+
+		int i;
+		for ( i = 0; i < numExtraMapParsers; i++ )
+		{
+			if ( s >= ( MAX_SHADER_STAGES - 1 ) )
+			{
+				Log::Warn( "too many extra stages in shader %s", shader.name );
+				return false;
+			}
+
+			mapName = va( "%s%s", baseName, extraMapParsers[ i ].suffix );
+			if( R_FindImageLoader( (char*) mapName, &prefix ) >= 0 ) {
+				Log::Debug( "found extra %s '%s'", extraMapParsers[ i ].description, mapName );
+				// colorMapStage.type = stageType_t::ST_DIFFUSEMAP;
+				extraMapParsers[ i ].parser( &stages[ s ], &mapName );
+				s++;
+			}
+		}
+	}
+
 	// ignore shaders that don't have any stages, unless it is a sky or fog
 	if ( s == 0 && !shader.forceOpaque && !shader.isSky && !( shader.contentFlags & CONTENTS_FOG ) && implicitMap[ 0 ] == '\0' )
 	{