#5565: Export texture filter

codereader · Mar 26, 2021 · bc16ae8 · bc16ae8
1 parent 6c6f55c
commit bc16ae8
Show file tree

Hide file tree

Showing 4 changed files with 97 additions and 0 deletions.
diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -79,6 +79,17 @@ std::ostream& operator<<(std::ostream& stream, Doom3ShaderLayer& layer)
         } // switch
     }
 
+    // Texture Filter
+    if (layer.getStageFlags() & IShaderLayer::FLAG_FILTER_NEAREST)
+    {
+        stream << "\t\tnearest\n";
+    }
+
+    if (layer.getStageFlags() & IShaderLayer::FLAG_FILTER_LINEAR)
+    {
+        stream << "\t\tlinear\n";
+    }
+
     stream << "\t}\n";
 
     return stream;

diff --git a/test/MaterialExport.cpp b/test/MaterialExport.cpp
@@ -523,4 +523,28 @@ TEST_F(MaterialExportTest, StageMaps)
     expectDefinitionContains(material, "soundMap waveform");
 }
 
+TEST_F(MaterialExportTest, TextureFilter)
+{
+    auto material = GlobalMaterialManager().getMaterial("textures/exporttest/empty");
+
+    EXPECT_EQ(string::trim_copy(material->getDefinition()), "");
+
+    auto layer = material->getEditableLayer(material->addLayer(IShaderLayer::BLEND));
+    layer->setStageFlag(IShaderLayer::FLAG_FILTER_NEAREST);
+    expectDefinitionContains(material, "nearest");
+    expectDefinitionDoesNotContain(material, "linear");
+
+    layer->clearStageFlag(IShaderLayer::FLAG_FILTER_NEAREST);
+    expectDefinitionDoesNotContain(material, "nearest");
+    expectDefinitionDoesNotContain(material, "linear");
+
+    layer->setStageFlag(IShaderLayer::FLAG_FILTER_LINEAR);
+    expectDefinitionContains(material, "linear");
+    expectDefinitionDoesNotContain(material, "nearest");
+
+    layer->clearStageFlag(IShaderLayer::FLAG_FILTER_LINEAR);
+    expectDefinitionDoesNotContain(material, "nearest");
+    expectDefinitionDoesNotContain(material, "linear");
+}
+
 }
diff --git a/test/Materials.cpp b/test/Materials.cpp
@@ -991,4 +991,13 @@ TEST_F(MaterialsTest, MaterialParserSurfaceFlags)
     }
 }
 
+TEST_F(MaterialsTest, MaterialParserTextureFiltering)
+{
+    auto material = GlobalMaterialManager().getMaterial("textures/parsertest/texturefilter/nearest");
+    EXPECT_NE(material->getAllLayers().front()->getStageFlags() & IShaderLayer::FLAG_FILTER_NEAREST, 0);
+
+    material = GlobalMaterialManager().getMaterial("textures/parsertest/texturefilter/linear");
+    EXPECT_NE(material->getAllLayers().front()->getStageFlags() & IShaderLayer::FLAG_FILTER_LINEAR, 0);
+}
+
 }
diff --git a/test/resources/tdm/materials/parsertest.mtr b/test/resources/tdm/materials/parsertest.mtr
@@ -545,3 +545,56 @@ textures/parsertest/surfaceflags/noimpact           { noimpact }
 textures/parsertest/surfaceflags/nodamage           { nodamage }
 textures/parsertest/surfaceflags/ladder             { ladder }
 textures/parsertest/surfaceflags/nosteps            { nosteps }
+
+textures/parsertest/texgen/normal
+{
+	{
+		blend diffusemap
+		map _white
+	}
+}
+
+textures/parsertest/texgen/reflect
+{
+	{
+		blend diffusemap
+		map _white
+        texgen reflect
+	}
+}
+
+textures/parsertest/texgen/skybox
+{
+	{
+		blend diffusemap
+		map _white
+        texgen skybox
+	}
+}
+
+textures/parsertest/texgen/skybox
+{
+	{
+		blend diffusemap
+		map _white
+        texgen skybox
+	}
+}
+
+textures/parsertest/texturefilter/nearest
+{
+	{
+		blend diffusemap
+		map _white
+        nearest
+	}
+}
+
+textures/parsertest/texturefilter/linear
+{
+	{
+		blend diffusemap
+		map _white
+        linear
+	}
+}