#5532: Add parsing code for TDM's lightFalloffCubeMap

codereader · Feb 19, 2021 · 006bab2 · 006bab2
1 parent 94c326c
commit 006bab2
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/include/ishaders.h b/include/ishaders.h
@@ -321,9 +321,12 @@ class Material
 
     virtual TexturePtr lightFalloffImage() = 0;
 
-    // The expression of the lightFalloffMap
+    // Return the expression of the light falloff texture for use with this shader.
     virtual shaders::IMapExpression::Ptr getLightFalloffExpression() = 0;
 
+    // Return the expression of the light falloff cubemap for use with this shader.
+    virtual shaders::IMapExpression::Ptr getLightFalloffCubeMapExpression() = 0;
+
 	// greebo: Returns the description as defined in the material
 	virtual std::string getDescription() const = 0;
 

diff --git a/install/ui/materialeditor.fbp b/install/ui/materialeditor.fbp
@@ -4307,7 +4307,7 @@
                                                                                             <property name="minimize_button">0</property>
                                                                                             <property name="minimum_size"></property>
                                                                                             <property name="moveable">1</property>
-                                                                                            <property name="name">m_textCtrl511</property>
+                                                                                            <property name="name">MaterialLightFalloffCubeMap</property>
                                                                                             <property name="pane_border">1</property>
                                                                                             <property name="pane_position"></property>
                                                                                             <property name="pane_size"></property>

diff --git a/install/ui/materialeditor.xrc b/install/ui/materialeditor.xrc
@@ -688,7 +688,7 @@
 																				<option>0</option>
 																				<flag>wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</flag>
 																				<border>0</border>
-																				<object class="wxTextCtrl" name="m_textCtrl511">
+																				<object class="wxTextCtrl" name="MaterialLightFalloffCubeMap">
 																					<value></value>
 																				</object>
 																			</object>

diff --git a/radiant/ui/materials/MaterialEditor.cpp b/radiant/ui/materials/MaterialEditor.cpp
@@ -362,6 +362,9 @@ void MaterialEditor::updateMaterialPropertiesFromMaterial()
         auto lightFalloffMap = _material->getLightFalloffExpression();
         getControl<wxTextCtrl>("MaterialLightFalloffMap")->SetValue(lightFalloffMap ? lightFalloffMap->getExpressionString() : "");
 
+        auto lightFalloffCubeMap = _material->getLightFalloffCubeMapExpression();
+        getControl<wxTextCtrl>("MaterialLightFalloffCubeMap")->SetValue(lightFalloffCubeMap ? lightFalloffCubeMap->getExpressionString() : "");
+
         // Surround the definition with curly braces, these are not included
         auto definition = fmt::format("{0}\n{{{1}}}", _material->getName(), _material->getDefinition());
         _sourceView->SetValue(definition);

diff --git a/radiantcore/shaders/CShader.cpp b/radiantcore/shaders/CShader.cpp
@@ -64,12 +64,16 @@ bool CShader::isEditorImageNoTex()
 	return (getEditorImage() == GetTextureManager().getShaderNotFound());
 }
 
-// Return the falloff texture name
 IMapExpression::Ptr CShader::getLightFalloffExpression()
 {
 	return _template->getLightFalloff();
 }
 
+IMapExpression::Ptr CShader::getLightFalloffCubeMapExpression()
+{
+	return _template->getLightFalloffCubeMap();
+}
+
 /*
  * Return the light falloff texture (Z dimension).
  */

diff --git a/radiantcore/shaders/CShader.h b/radiantcore/shaders/CShader.h
@@ -53,13 +53,10 @@ class CShader
 	// Return the light falloff texture (Z dimension).
 	TexturePtr lightFalloffImage();
 
-	/**
-	 * Return the name of the light falloff texture for use with this shader.
-	 * Shaders which do not define their own falloff will take the default from
-	 * the defaultPointLight shader.
-	 */
     IMapExpression::Ptr getLightFalloffExpression() override;
 
+    IMapExpression::Ptr getLightFalloffCubeMapExpression() override;
+
 	/*
 	 * Return name of shader.
 	 */

diff --git a/radiantcore/shaders/ShaderTemplate.cpp b/radiantcore/shaders/ShaderTemplate.cpp
@@ -375,6 +375,10 @@ bool ShaderTemplate::parseLightKeywords(parser::DefTokeniser& tokeniser, const s
     else if (!fogLight && token == "lightfalloffimage")
 	{
         _lightFalloff = MapExpression::createForToken(tokeniser);
+    }
+    else if (token == "lightfalloffcubemap")
+    {
+        _lightFalloffCubeMap = MapExpression::createForToken(tokeniser);
     }
 	else if (token == "spectrum")
 	{

diff --git a/radiantcore/shaders/ShaderTemplate.h b/radiantcore/shaders/ShaderTemplate.h
@@ -44,6 +44,7 @@ class ShaderTemplate
 
 	// Map expressions
 	shaders::MapExpressionPtr _lightFalloff;
+	shaders::MapExpressionPtr _lightFalloffCubeMap;
 
 	/* Light type booleans */
 	bool fogLight;
@@ -266,6 +267,12 @@ class ShaderTemplate
 		if (!_parsed) parseDefinition();
 		return _lightFalloff;
 	}
+
+    const MapExpressionPtr& getLightFalloffCubeMap()
+	{
+		if (!_parsed) parseDefinition();
+		return _lightFalloffCubeMap;
+	}
 
 	// Add a specific layer to this template
 	void addLayer(ShaderLayer::Type type, const MapExpressionPtr& mapExpr);