Updated material editor to only show relevant shader settings (#519)

* Settings that aren't available to the currently selected variant (based off the enabled shader features), are now hidden
* Material serialization flow updated to skip properties that aren't used by the current variant
* Added warning when a shadow receiver doesn't have the right uniforms
* Cleaned up material editor and renamed sections
* Cleaned up atmospheric scattering shader (removed unused code)

Author: adriengivry

Resources/Engine/Materials/Default.ovmat

@@ -11,15 +11,9 @@
         <receive_shadows>true</receive_shadows>
         <user_interface>false</user_interface>
         <gpu_instances>1</gpu_instances>
+        <draw_order>1000</draw_order>
     </settings>
     <uniforms>
-        <uniform>
-            <name>_LightSpaceMatrix</name>
-        </uniform>
-        <uniform>
-            <name>_ShadowMap</name>
-            <value>?</value>
-        </uniform>
         <uniform>
             <name>u_Albedo</name>
             <value>
@@ -33,22 +27,10 @@
             <name>u_AlbedoMap</name>
             <value>?</value>
         </uniform>
-        <uniform>
-            <name>u_AlphaClippingThreshold</name>
-            <value>0.1</value>
-        </uniform>
         <uniform>
             <name>u_AmbientOcclusionMap</name>
             <value>?</value>
         </uniform>
-        <uniform>
-            <name>u_HeightMap</name>
-            <value>?</value>
-        </uniform>
-        <uniform>
-            <name>u_HeightScale</name>
-            <value>0.050000001</value>
-        </uniform>
         <uniform>
             <name>u_MaskMap</name>
             <value>?</value>
@@ -61,14 +43,6 @@
             <name>u_MetallicMap</name>
             <value>?</value>
         </uniform>
-        <uniform>
-            <name>u_NormalMap</name>
-            <value>?</value>
-        </uniform>
-        <uniform>
-            <name>u_ParallaxClipEdges</name>
-            <value>0</value>
-        </uniform>
         <uniform>
             <name>u_Roughness</name>
             <value>0.5</value>
@@ -77,10 +51,6 @@
             <name>u_RoughnessMap</name>
             <value>?</value>
         </uniform>
-        <uniform>
-            <name>u_ShadowClippingThreshold</name>
-            <value>0.5</value>
-        </uniform>
         <uniform>
             <name>u_TextureOffset</name>
             <value>

Resources/Engine/Shaders/Atmosphere.ovfx

@@ -6,11 +6,9 @@
 #version 450 core
 
 #include ":Shaders/Common/Buffers/EngineUBO.ovfxh"
-#include ":Shaders/Common/Utils.ovfxh"
 #include ":Shaders/Common/Buffers/LightsSSBO.ovfxh"
 
 layout (location = 0) in vec3 geo_Pos;
-layout (location = 1) in vec2 geo_TexCoords;
 
 out VS_OUT
 {
@@ -56,7 +54,6 @@ void main()
 #version 450 core
 
 #include ":Shaders/Common/Buffers/EngineUBO.ovfxh"
-#include ":Shaders/Common/Utils.ovfxh"
 
 in VS_OUT
 {

Sources/Overload/OvCore/src/OvCore/Rendering/ShadowRenderFeature.cpp

@@ -42,8 +42,17 @@ void OvCore::Rendering::ShadowRenderFeature::OnBeforeDraw(OvRendering::Data::Pip
 					if (light.type == OvRendering::Settings::ELightType::DIRECTIONAL)
 					{
 						const auto shadowTex = light.GetShadowBuffer().GetAttachment<OvRendering::HAL::Texture>(OvRendering::Settings::EFramebufferAttachment::DEPTH);
-						material.SetProperty("_ShadowMap", &shadowTex.value(), true); // Single use material property
-						material.SetProperty("_LightSpaceMatrix", light.GetLightSpaceMatrix(), true);
+
+						if (!material.TrySetProperty("_ShadowMap", &shadowTex.value(), true))
+						{
+							OVLOG_WARNING("ShadowRenderFeature: Material does not have a _ShadowMap property");
+						}
+
+						if (!material.TrySetProperty("_LightSpaceMatrix", light.GetLightSpaceMatrix(), true))
+						{
+							OVLOG_WARNING("ShadowRenderFeature: Material does not have a _LightSpaceMatrix property");
+						}
+
 						++lightIndex;
 					}
 				}

Sources/Overload/OvCore/src/OvCore/Resources/Material.cpp

@@ -36,8 +36,28 @@ void OvCore::Resources::Material::OnSerialize(tinyxml2::XMLDocument& p_doc, tiny
 	tinyxml2::XMLNode* uniformsNode = p_doc.NewElement("uniforms");
 	p_node->InsertEndChild(uniformsNode);
 
+	const auto program = GetProgram();
+
+	// If the material has no valid program for the current feature set, we skip serialization of properties.
+	if (!program)
+	{
+		return;
+	}
+
 	for (const auto& [name, prop] : m_properties)
 	{
+		// Skip serialization of this property if the current program isn't using its associated uniform
+		if (!program->GetUniformInfo(name))
+		{
+			continue;
+		}
+
+		// Skip serialization of this property if it is marked as single-use
+		if (prop.singleUse)
+		{
+			continue;
+		}
+
 		auto& value = prop.value;
 		tinyxml2::XMLNode* uniform = p_doc.NewElement("uniform");
 		uniformsNode->InsertEndChild(uniform);

Sources/Overload/OvEditor/include/OvEditor/Panels/MaterialEditor.h

@@ -71,30 +71,30 @@ namespace OvEditor::Panels
 		void CreateMaterialSelector();
 		void CreateShaderSelector();
 		void CreateMaterialSettings();
-		void CreateShaderSettings();
-		void CreateFeatureSettings();
+		void CreateMaterialFeatures();
+		void CreateMaterialProperties();
 
-		void GenerateShaderSettingsContent();
 		void GenerateMaterialSettingsContent();
 		void GenerateMaterialFeaturesContent();
+		void GenerateMaterialPropertiesContent();
 
 	private:
-		OvCore::Resources::Material* m_target		= nullptr;
-		OvRendering::Resources::Shader* m_shader	= nullptr;
+		OvCore::Resources::Material* m_target = nullptr;
+		OvRendering::Resources::Shader* m_shader = nullptr;
 
-		OvUI::Widgets::Texts::Text* m_targetMaterialText	= nullptr;
-		OvUI::Widgets::Texts::Text* m_shaderText			= nullptr;
+		OvUI::Widgets::Texts::Text* m_targetMaterialText = nullptr;
+		OvUI::Widgets::Texts::Text* m_shaderText = nullptr;
 
 		OvTools::Eventing::Event<> m_materialDroppedEvent;
 		OvTools::Eventing::Event<> m_shaderDroppedEvent;
 
-		OvUI::Widgets::Layout::Group* m_settings			= nullptr;
-		OvUI::Widgets::Layout::Group* m_materialSettings	= nullptr;
-		OvUI::Widgets::Layout::Group* m_shaderSettings = nullptr;
-		OvUI::Widgets::Layout::Group* m_featureSettings = nullptr;
+		OvUI::Widgets::Layout::Group* m_settings = nullptr;
+		OvUI::Widgets::Layout::Group* m_materialSettings = nullptr;
+		OvUI::Widgets::Layout::Group* m_materialFeatures = nullptr;
+		OvUI::Widgets::Layout::Group* m_materialProperties = nullptr;
 
-		OvUI::Widgets::Layout::Columns<2>* m_shaderSettingsColumns = nullptr;
 		OvUI::Widgets::Layout::Columns<2>* m_materialSettingsColumns = nullptr;
-		OvUI::Widgets::Layout::Columns<2>* m_featureSettingsColumns = nullptr;
+		OvUI::Widgets::Layout::Columns<2>* m_materialFeaturesColumns = nullptr;
+		OvUI::Widgets::Layout::Columns<2>* m_materialPropertiesColumns = nullptr;
 	};
 }