#5567: Some materials are using _white.tga instead of _white in frob …

…stages
codereader · Apr 2, 2021 · 699a3fd · 699a3fd
1 parent 079e9bd
commit 699a3fd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/libs/materials/FrobStageSetup.h b/libs/materials/FrobStageSetup.h
@@ -3,6 +3,7 @@
 #include "i18n.h"
 #include "ishaders.h"
 #include "ishaderlayer.h"
+#include "string/predicate.h"
 
 namespace shaders
 {
@@ -128,8 +129,8 @@ class FrobStageSetup
                 continue;
             }
 
-            // map _white
-            if (!layer->getMapExpression() || layer->getMapExpression()->getExpressionString() != WhiteBlendMap)
+            // map _white (or _white.tga)
+            if (!layer->getMapExpression() || !string::starts_with(layer->getMapExpression()->getExpressionString(), WhiteBlendMap))
             {
                 continue;
             }

diff --git a/test/Materials.cpp b/test/Materials.cpp
@@ -1408,6 +1408,11 @@ TEST_F(MaterialsTest, MaterialFrobStageDetection)
     EXPECT_TRUE(shaders::FrobStageSetup::IsPresent(material));
     EXPECT_TRUE(shaders::FrobStageSetup::HasAdditiveDiffuseStage(material));
     EXPECT_TRUE(shaders::FrobStageSetup::HasWhiteBlendStage(material));
+
+    material = GlobalMaterialManager().getMaterial("textures/parsertest/frobstage_present2");
+    EXPECT_TRUE(shaders::FrobStageSetup::IsPresent(material));
+    EXPECT_TRUE(shaders::FrobStageSetup::HasAdditiveDiffuseStage(material));
+    EXPECT_TRUE(shaders::FrobStageSetup::HasWhiteBlendStage(material));
 
     material = GlobalMaterialManager().getMaterial("textures/parsertest/frobstage_missing1");
     EXPECT_FALSE(shaders::FrobStageSetup::IsPresent(material));
@@ -1486,6 +1491,7 @@ void checkFrobStageRemoval(const std::string& materialName)
 TEST_F(MaterialsTest, MaterialFrobStageRemoval)
 {
     checkFrobStageRemoval("textures/parsertest/frobstage_present1");
+    checkFrobStageRemoval("textures/parsertest/frobstage_present2");
     checkFrobStageRemoval("textures/parsertest/frobstage_missing1");
     checkFrobStageRemoval("textures/parsertest/frobstage_missing2");
     checkFrobStageRemoval("textures/parsertest/frobstage_missing3");

diff --git a/test/resources/tdm/materials/parsertest.mtr b/test/resources/tdm/materials/parsertest.mtr
@@ -925,6 +925,26 @@ textures/parsertest/frobstage_present1
     }
 }
 
+textures/parsertest/frobstage_present2 // is using _white.tga instead _white
+{
+    qer_editorimage textures/numbers/0
+    diffusemap      textures/numbers/0
+    bumpmap         textures/numbers/1
+
+    {
+        if ( parm11 > 0 )
+        blend       gl_dst_color, gl_one
+        map         _white.tga
+        rgb         0.40 * parm11
+    }
+    {
+        if ( parm11 > 0 )
+        blend       add
+        map         textures/numbers/0
+        rgb         0.15 * parm11
+    }
+}
+
 textures/parsertest/frobstage_missing1
 {
     diffusemap      textures/numbers/0