#6212: Implement frob stage setters

nbohr1more · Jan 2, 2023 · a399a0e · a399a0e
1 parent 83e3fd8
commit a399a0e
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 5 deletions.
diff --git a/radiantcore/shaders/CShader.cpp b/radiantcore/shaders/CShader.cpp
@@ -199,7 +199,7 @@ Material::FrobStageType CShader::getFrobStageType()
 void CShader::setFrobStageType(Material::FrobStageType type)
 {
     ensureTemplateCopy();
-    // TODO
+    _template->setFrobStageType(type);
 }
 
 IMapExpression::Ptr CShader::getFrobStageMapExpression()
@@ -210,7 +210,7 @@ IMapExpression::Ptr CShader::getFrobStageMapExpression()
 void CShader::setFrobStageMapExpressionFromString(const std::string& expr)
 {
     ensureTemplateCopy();
-    // TODO
+    _template->setFrobStageMapExpressionFromString(expr);
 }
 
 Vector3 CShader::getFrobStageRgbParameter(std::size_t index)
@@ -221,13 +221,13 @@ Vector3 CShader::getFrobStageRgbParameter(std::size_t index)
 void CShader::setFrobStageParameter(std::size_t index, double value)
 {
     ensureTemplateCopy();
-    // TODO
+    _template->setFrobStageParameter(index, value);
 }
 
 void CShader::setFrobStageRgbParameter(std::size_t index, const Vector3& value)
 {
     ensureTemplateCopy();
-    // TODO
+    _template->setFrobStageRgbParameter(index, value);
 }
 
 bool CShader::IsInUse() const {

diff --git a/radiantcore/shaders/ShaderTemplate.cpp b/radiantcore/shaders/ShaderTemplate.cpp
@@ -119,6 +119,47 @@ void ShaderTemplate::setDecalInfo(const Material::DecalInfo& info)
     onTemplateChanged();
 }
 
+void ShaderTemplate::setFrobStageType(Material::FrobStageType type)
+{
+    ensureParsed();
+
+    _frobStageType = type;
+
+    onTemplateChanged();
+}
+
+void ShaderTemplate::setFrobStageMapExpressionFromString(const std::string& expr)
+{
+    ensureParsed();
+
+    if (!expr.empty())
+    {
+        _frobStageMapExpression = MapExpression::createForString(expr);
+    }
+    else
+    {
+        _frobStageMapExpression.reset();
+    }
+
+    onTemplateChanged();
+}
+
+void ShaderTemplate::setFrobStageParameter(std::size_t index, double value)
+{
+    setFrobStageRgbParameter(index, Vector3(value, value, value));
+}
+
+void ShaderTemplate::setFrobStageRgbParameter(std::size_t index, const Vector3& value)
+{
+    if (index > 1) throw std::out_of_range("Index must be 0 or 1");
+
+    ensureParsed();
+
+    _frobStageRgbParameter[index] = value;
+
+    onTemplateChanged();
+}
+
 IShaderExpression::Ptr ShaderTemplate::parseSingleExpressionTerm(parser::DefTokeniser& tokeniser)
 {
 	std::string token = tokeniser.nextToken();

diff --git a/radiantcore/shaders/ShaderTemplate.h b/radiantcore/shaders/ShaderTemplate.h
@@ -520,6 +520,11 @@ class ShaderTemplate final :
         return index < 2 ? _frobStageRgbParameter[index] : Vector3(0,0,0);
 	}
 
+    void setFrobStageType(Material::FrobStageType type);
+    void setFrobStageMapExpressionFromString(const std::string& expr);
+    void setFrobStageParameter(std::size_t index, double value);
+    void setFrobStageRgbParameter(std::size_t index, const Vector3& value);
+
     std::size_t addLayer(IShaderLayer::Type type);
     void removeLayer(std::size_t index);
     void swapLayerPosition(std::size_t first, std::size_t second);

diff --git a/test/MaterialExport.cpp b/test/MaterialExport.cpp
@@ -1200,7 +1200,7 @@ TEST_F(MaterialExportTest, FrobStageKeywords)
     // Texture
     material->setFrobStageType(Material::FrobStageType::Texture);
 
-    // Still contains the RGB values from the diffuse test above
+    // Still contains the RGB values from the diffuse test above, but with the default _white
     expectDefinitionContains(material, "frobstage_texture _white (0.7 0.8 0.6) (0.1 0.3 0.5)");
 
     material->setFrobStageParameter(0, 0.2);