#6212: MaterialSourceGenerator can export frobstage syntax now

nbohr1more · Jan 2, 2023 · 9d13df4 · 9d13df4
1 parent a399a0e
commit 9d13df4
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 0 deletions.
diff --git a/libs/materials/ParseLib.h b/libs/materials/ParseLib.h
@@ -404,6 +404,27 @@ inline std::string getStringForClampType(ClampType type)
     return std::string();
 }
 
+constexpr std::pair<Material::FrobStageType, const char*> FrobStageTypeNames[]
+{
+    { Material::FrobStageType::Default, "" },
+    { Material::FrobStageType::Diffuse, "frobstage_diffuse" },
+    { Material::FrobStageType::Texture, "frobstage_texture" },
+    { Material::FrobStageType::None, "frobstage_none" },
+};
+
+inline std::string getStringForFrobStageType(Material::FrobStageType type)
+{
+    for (const auto& pair : FrobStageTypeNames)
+    {
+        if (type == pair.first)
+        {
+            return pair.second;
+        }
+    }
+
+    return std::string();
+}
+
 constexpr int NUM_MAX_VERTEX_PARMS = 4;
 constexpr int NUM_MAX_FRAGMENT_MAPS = 8;
 

diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -441,6 +441,19 @@ std::ostream& operator<<(std::ostream& stream, Doom3ShaderLayer& layer)
     return stream;
 }
 
+// Writes (x y z) or just a single number without parentheses if the vector has uniform values
+void writeScalarOrVector3(std::ostream& stream, const Vector3& vec)
+{
+    if (vec.x() == vec.y() && vec.y() == vec.z())
+    {
+        stream << vec.x();
+    }
+    else
+    {
+        stream << "(" << vec.x() << " " << vec.y() << " " << vec.z() << ")";
+    }
+}
+
 // Write the material to the given stream (one tab indentation)
 std::ostream& operator<<(std::ostream& stream, ShaderTemplate& shaderTemplate)
 {
@@ -676,6 +689,29 @@ std::ostream& operator<<(std::ostream& stream, ShaderTemplate& shaderTemplate)
         stream << *layer;
     }
 
+    // FrobStage keywords
+    if (shaderTemplate.getFrobStageType() != Material::FrobStageType::Default)
+    {
+        stream << "\n";
+        stream << getStringForFrobStageType(shaderTemplate.getFrobStageType());
+
+        if (shaderTemplate.getFrobStageType() == Material::FrobStageType::Texture)
+        {
+            stream << " ";
+            const auto& expr = shaderTemplate.getFrobStageMapExpression();
+            stream << (expr ? expr->getExpressionString() : "_white"); // don't export invalid syntax
+        }
+
+        if (shaderTemplate.getFrobStageType() == Material::FrobStageType::Diffuse ||
+            shaderTemplate.getFrobStageType() == Material::FrobStageType::Texture)
+        {
+            stream << " ";
+            writeScalarOrVector3(stream, shaderTemplate.getFrobStageRgbParameter(0));
+            stream << " ";
+            writeScalarOrVector3(stream, shaderTemplate.getFrobStageRgbParameter(1));
+        }
+    }
+
     return stream;
 }