tr_shader: delayed animation texture loading

Author: illwieckz

src/engine/renderer/tr_shader.cpp

@@ -95,6 +95,13 @@ struct delayedStageTexture_t {
 
 delayedStageTexture_t delayedStageTextures[ MAX_TEXTURE_BUNDLES ];
 
+struct delayedAnimationTexture_t {
+	bool active;
+	char path[ MAX_QPATH ];
+};
+
+delayedAnimationTexture_t delayedAnimationTextures[ MAX_IMAGE_ANIMATIONS ];
+
 /*
 ================
 return a hash value for the filename
@@ -1607,6 +1614,13 @@ static void DelayStageTexture( const char* texturePath, const stageType_t stageT
 	delayedStageTextures[ bundleIndex ].active = true;
 }
 
+static void DelayAnimationTexture( const char* texturePath, const size_t animationIndex )
+{
+	Log::Debug("Delaying the loading of animation texture %s", texturePath );
+	strncpy( delayedAnimationTextures[ animationIndex ].path, texturePath, MAX_QPATH - 1 );
+	delayedAnimationTextures[ animationIndex ].active = true;
+}
+
 /*
 ===================
 ParseDifuseMap
@@ -2079,8 +2093,10 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 	filterType_t filterType;
 	char         buffer[ 1024 ] = "";
 	bool     loadMap = false;
+	bool loadAnimMap = true;
 
 	memset( delayedStageTextures, 0, sizeof( delayedStageTextures ) );
+	memset( delayedAnimationTextures, 0, sizeof( delayedAnimationTextures ) );
 
 	while ( true )
 	{
@@ -2294,44 +2310,21 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 
 			stage->bundle[ 0 ].imageAnimationSpeed = atof( token );
 
-			// parse up to MAX_IMAGE_ANIMATIONS animations
-			while ( true )
-			{
-				int num;
+			loadAnimMap = true;
 
+			// Parse up to MAX_IMAGE_ANIMATIONS animation frames, skip extraneous ones.
+			for ( size_t animationIndex = 0; ; animationIndex++ )
+			{
 				token = COM_ParseExt2( text, false );
 
 				if ( !token[ 0 ] )
 				{
 					break;
 				}
 
-				num = stage->bundle[ 0 ].numImages;
-
-				if ( num < MAX_IMAGE_ANIMATIONS )
+				if ( animationIndex < MAX_IMAGE_ANIMATIONS )
 				{
-					imageParams_t imageParams = {};
-					imageParams.bits = IF_NONE;
-					imageParams.filterType = filterType_t::FT_DEFAULT;
-					imageParams.wrapType = wrapTypeEnum_t::WT_REPEAT;
-					imageParams.minDimension = shader.imageMinDimension;
-					imageParams.maxDimension = shader.imageMaxDimension;
-
-					if ( tr.worldLinearizeTexture )
-					{
-						imageParams.bits |= IF_SRGB;
-					}
-
-					stage->bundle[ 0 ].image[ num ] = R_FindImageFile( token, imageParams );
-
-					if ( !stage->bundle[ 0 ].image[ num ] )
-					{
-						Log::Warn("R_FindImageFile could not find '%s' in shader '%s'", token,
-						           shader.name );
-						return false;
-					}
-
-					stage->bundle[ 0 ].numImages++;
+					DelayAnimationTexture( token, animationIndex );
 				}
 			}
 		}
@@ -3345,6 +3338,46 @@ static bool ParseStage( shaderStage_t *stage, const char **text )
 		return true;
 	}
 
+	if ( loadAnimMap )
+	{
+		for ( size_t animationIndex = 0; animationIndex < MAX_IMAGE_ANIMATIONS; animationIndex++ )
+		{
+			auto& delayedAnimationTexture = delayedAnimationTextures[ animationIndex ];
+
+			if ( delayedAnimationTexture.active )
+			{
+				auto& numImages = stage->bundle[ 0 ].numImages;
+
+				imageParams_t imageParams = {};
+				imageParams.bits = IF_NONE;
+				imageParams.filterType = filterType_t::FT_DEFAULT;
+				imageParams.wrapType = wrapTypeEnum_t::WT_REPEAT;
+				imageParams.minDimension = shader.imageMinDimension;
+				imageParams.maxDimension = shader.imageMaxDimension;
+
+				if ( tr.worldLinearizeTexture )
+				{
+					imageParams.bits |= IF_SRGB;
+				}
+
+				Log::Debug("Loading delayed animation texture %s", delayedAnimationTexture.path );
+
+				stage->bundle[ 0 ].image[ numImages ] =
+					R_FindImageFile( delayedAnimationTexture.path, imageParams );
+
+				if ( !stage->bundle[ 0 ].image[ numImages ] )
+				{
+					Log::Warn("Failed to load delayed animation texture %d from shader '%s': %s",
+						animationIndex, shader.name, delayedAnimationTexture.path );
+
+					return false;
+				}
+
+				numImages++;
+			}
+		}
+	}
+
 	/* If there is more than one colormap, it's a mistake anyway,
 	so we don't care about the possibility it overwrites one. */
 	if ( loadMap )