#5565: Export light-related keywords

codereader · Mar 26, 2021 · af2e043 · af2e043
1 parent 3fb802a
commit af2e043
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 1 deletion.
diff --git a/radiantcore/shaders/MaterialSourceGenerator.cpp b/radiantcore/shaders/MaterialSourceGenerator.cpp
@@ -158,6 +158,44 @@ std::ostream& operator<<(std::ostream& stream, ShaderTemplate& shaderTemplate)
         stream << "\trenderbumpflat " << shaderTemplate.getRenderBumpFlatArguments() << "\n";
     }
 
+    // Light Flags
+    if (shaderTemplate.isAmbientLight() && shaderTemplate.isCubicLight())
+    {
+        stream << "\tambientCubicLight\n";
+    }
+    else
+    {
+        if (shaderTemplate.isAmbientLight())
+        {
+            stream << "\tambientLight\n";
+        }
+        else if (shaderTemplate.isCubicLight())
+        {
+            stream << "\tcubicLight\n";
+        }
+    }
+
+    if (shaderTemplate.isFogLight())
+    {
+        stream << "\tfogLight\n";
+    }
+    else if (shaderTemplate.isBlendLight())
+    {
+        stream << "\tblendLight\n";
+    }
+
+    if (shaderTemplate.getLightFalloff())
+    {
+        if (shaderTemplate.getLightFalloffCubeMapType() == IShaderLayer::MapType::CameraCubeMap)
+        {
+            stream << "\tlightFalloffCubeMap " << shaderTemplate.getLightFalloff()->getExpressionString() << "\n";
+        }
+        else
+        {
+            stream << "\tlightFalloffImage " << shaderTemplate.getLightFalloff()->getExpressionString() << "\n";
+        }
+    }
+
     for (const auto& layer : shaderTemplate.getLayers())
     {
         stream << "\t{\n";

diff --git a/radiantcore/shaders/ShaderTemplate.h b/radiantcore/shaders/ShaderTemplate.h
@@ -436,7 +436,8 @@ class ShaderTemplate final
     void setLightFalloffExpressionFromString(const std::string& expressionString)
     {
         if (!_parsed) parseDefinition();
-        _lightFalloff = MapExpression::createForString(expressionString);
+        _lightFalloff = !expressionString.empty() ? 
+            MapExpression::createForString(expressionString) : MapExpressionPtr();
 
         onTemplateChanged();
     }

diff --git a/test/MaterialExport.cpp b/test/MaterialExport.cpp
@@ -331,4 +331,57 @@ TEST_F(MaterialExportTest, RenderBumpFlat)
     expectDefinitionContains(material, "renderbumpflat models/hipoly");
 }
 
+TEST_F(MaterialExportTest, LightFlags)
+{
+    auto material = GlobalMaterialManager().getMaterial("textures/exporttest/empty");
+
+    EXPECT_EQ(string::trim_copy(material->getDefinition()), "");
+
+    material->setIsAmbientLight(true);
+    expectDefinitionContains(material, "ambientLight");
+    material->setIsAmbientLight(false);
+    expectDefinitionDoesNotContain(material, "ambientLight");
+
+    material->setIsBlendLight(true);
+    expectDefinitionContains(material, "blendLight");
+    material->setIsBlendLight(false);
+    expectDefinitionDoesNotContain(material, "blendLight");
+
+    material->setIsFogLight(true);
+    expectDefinitionContains(material, "fogLight");
+    material->setIsFogLight(false);
+    expectDefinitionDoesNotContain(material, "fogLight");
+
+    material->setIsCubicLight(true);
+    expectDefinitionContains(material, "cubicLight");
+    material->setIsCubicLight(false);
+    expectDefinitionDoesNotContain(material, "cubicLight");
+
+    material->setIsCubicLight(true);
+    material->setIsAmbientLight(true);
+    expectDefinitionContains(material, "ambientCubicLight");
+
+    material->setIsAmbientLight(false);
+    material->setIsCubicLight(false);
+    expectDefinitionDoesNotContain(material, "ambientCubicLight");
+}
+
+TEST_F(MaterialExportTest, LightFalloffImage)
+{
+    auto material = GlobalMaterialManager().getMaterial("textures/exporttest/empty");
+
+    EXPECT_EQ(string::trim_copy(material->getDefinition()), "");
+
+    material->setLightFalloffCubeMapType(IShaderLayer::MapType::Map);
+    material->setLightFalloffExpressionFromString("makeintensity(lights/standard)");
+    expectDefinitionContains(material, "lightFalloffImage makeIntensity(lights/standard)");
+
+    material->setLightFalloffExpressionFromString("");
+    expectDefinitionDoesNotContain(material, "lightFalloffImage");
+
+    material->setLightFalloffCubeMapType(IShaderLayer::MapType::CameraCubeMap);
+    material->setLightFalloffExpressionFromString("env/standard");
+    expectDefinitionContains(material, "lightFalloffCubeMap env/standard");
+}
+
 }