Fix range for HDRP Asset settings

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -298,6 +298,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed white flash with SSR when resetting camera history (case 1335263).
 - Fixed VFX flag "Exclude From TAA" not working for some particle types.
 - Fixed Dof and MSAA. DoF is now using the min depth of the per-pixel MSAA samples when MSAA is enabled. This removes 1-pixel ringing from in focus objects (case 1347291).
+- Fixed parameter ranges in HDRP Asset settings.
 
 ### Changed
 - Changed Window/Render Pipeline/HD Render Pipeline Wizard to Window/Rendering/HDRP Wizard

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.Skin.cs

@@ -114,7 +114,7 @@ public class Styles
             // Fog
             public static readonly GUIContent FogSettingsSubTitle = EditorGUIUtility.TrTextContent("Volumetric Fog");
             public static readonly GUIContent FogSettingsBudget = EditorGUIUtility.TrTextContent("Volumetric Fog Budget");
-            public static readonly GUIContent FogSettingsRatio = EditorGUIUtility.TrTextContent("Volumetric Fog Ratio");
+            public static readonly GUIContent FogSettingsRatio = EditorGUIUtility.TrTextContent("Resolution Depth Ratio");
 
             public static readonly GUIContent materialQualityLevelContent = EditorGUIUtility.TrTextContent("Default Material Quality Level", "");
 

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/HDRenderPipelineUI.cs

@@ -339,7 +339,10 @@ static void Drawer_SectionShadows(SerializedHDRenderPipelineAsset serialized, Ed
         {
             EditorGUILayout.PropertyField(serialized.renderPipelineSettings.supportShadowMask, Styles.supportShadowMaskContent);
 
+            EditorGUI.BeginChangeCheck();
             EditorGUILayout.DelayedIntField(serialized.renderPipelineSettings.hdShadowInitParams.maxShadowRequests, Styles.maxRequestContent);
+            if (EditorGUI.EndChangeCheck())
+                serialized.renderPipelineSettings.hdShadowInitParams.maxShadowRequests.intValue = Mathf.Max(1, serialized.renderPipelineSettings.hdShadowInitParams.maxShadowRequests.intValue);
 
             if (!serialized.renderPipelineSettings.supportedLitShaderMode.hasMultipleDifferentValues)
             {
@@ -374,7 +377,11 @@ static void DrawLightShadow(
             using (new EditorGUI.IndentLevelScope())
             {
                 scalableSetting.ValueGUI<int>(Styles.shadowResolutionTiers);
+
+                EditorGUI.BeginChangeCheck();
                 EditorGUILayout.DelayedIntField(resolutionProperty, Styles.maxShadowResolution);
+                if (EditorGUI.EndChangeCheck())
+                    resolutionProperty.intValue = Mathf.Max(1, resolutionProperty.intValue);
 
                 EditorGUILayout.LabelField(Styles.shadowLightAtlasSubTitle, EditorStyles.boldLabel);
 
@@ -689,14 +696,14 @@ static void Drawer_SectionVTSettings(SerializedHDRenderPipelineAsset serialized,
         static void DrawDepthOfFieldQualitySetting(SerializedHDRenderPipelineAsset serialized, int tier)
         {
             {
-                EditorGUILayout.LabelField(Styles.nearBlurSubTitle);
+                EditorGUILayout.LabelField(Styles.nearBlurSubTitle, EditorStyles.miniLabel);
                 ++EditorGUI.indentLevel;
                 {
                     EditorGUILayout.PropertyField(serialized.renderPipelineSettings.postProcessQualitySettings.NearBlurSampleCount.GetArrayElementAtIndex(tier), Styles.sampleCountQuality);
                     EditorGUILayout.PropertyField(serialized.renderPipelineSettings.postProcessQualitySettings.NearBlurMaxRadius.GetArrayElementAtIndex(tier), Styles.maxRadiusQuality);
                 }
                 --EditorGUI.indentLevel;
-                EditorGUILayout.LabelField(Styles.farBlurSubTitle);
+                EditorGUILayout.LabelField(Styles.farBlurSubTitle, EditorStyles.miniLabel);
                 ++EditorGUI.indentLevel;
                 {
                     EditorGUILayout.PropertyField(serialized.renderPipelineSettings.postProcessQualitySettings.FarBlurSampleCount.GetArrayElementAtIndex(tier), Styles.sampleCountQuality);
@@ -864,8 +871,27 @@ static void Drawer_SectionRenderingUnsorted(SerializedHDRenderPipelineAsset seri
                 --EditorGUI.indentLevel;
             }
 
+            EditorGUI.BeginChangeCheck();
             serialized.renderPipelineSettings.lodBias.ValueGUI<float>(Styles.LODBias);
+            if (EditorGUI.EndChangeCheck())
+            {
+                for (var i = 0; i < serialized.renderPipelineSettings.lodBias.GetSchemaLevelCount(); ++i)
+                {
+                    var prop = serialized.renderPipelineSettings.lodBias.values.GetArrayElementAtIndex(i);
+                    prop.SetInline(Mathf.Max(0.01f, prop.GetInline<float>()));
+                }
+            }
+
+            EditorGUI.BeginChangeCheck();
             serialized.renderPipelineSettings.maximumLODLevel.ValueGUI<int>(Styles.maximumLODLevel);
+            if (EditorGUI.EndChangeCheck())
+            {
+                for (var i = 0; i < serialized.renderPipelineSettings.maximumLODLevel.GetSchemaLevelCount(); ++i)
+                {
+                    var prop = serialized.renderPipelineSettings.maximumLODLevel.values.GetArrayElementAtIndex(i);
+                    prop.SetInline(Mathf.Clamp(prop.GetInline<int>(), 0, 7));
+                }
+            }
 
             EditorGUILayout.Space(); //to separate with following sub sections
         }

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/Settings/SerializedScalableSetting.cs

@@ -53,6 +53,14 @@ public bool TryGetLevelValue<T>(int level, out T value)
                 return false;
             }
         }
+
+        public int GetSchemaLevelCount()
+        {
+            var schema = ScalableSettingSchema.GetSchemaOrNull(new ScalableSettingSchemaId(schemaId.stringValue))
+                ?? ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels);
+
+            return schema.levelCount;
+        }
     }
 
     internal static class SerializedScalableSettingUI

com.unity.render-pipelines.high-definition/Runtime/PostProcessing/GlobalPostProcessSettings.cs

@@ -76,6 +76,7 @@ public struct GlobalPostProcessSettings
         /// </summary>
         public const int k_MaxLutSize = 65;
 
+        [Range(k_MinLutSize, k_MaxLutSize)]
         [SerializeField]
         int m_LutSize;
 

com.unity.render-pipelines.high-definition/Runtime/RenderPipeline/GlobalLightingQualitySettings.cs

@@ -172,28 +172,35 @@ internal GlobalLightingQualitySettings()
         internal static GlobalLightingQualitySettings NewDefault() => new GlobalLightingQualitySettings();
 
         // SSAO
-        /// <summary>Ambient Occlusion step count for each quality level.</summary>
+        /// <summary>Ambient Occlusion step count for each quality level. The array must have one entry per scalable setting level, and elements must be between 2 and 32.</summary>
+        [Range(2, 32)]
         public int[] AOStepCount = new int[s_QualitySettingCount];
-        /// <summary>Ambient Occlusion uses full resolution buffer for each quality level.</summary>
+        /// <summary>Ambient Occlusion uses full resolution buffer for each quality level. The array must have one entry per scalable setting level.</summary>
         public bool[] AOFullRes = new bool[s_QualitySettingCount];
-        /// <summary>Ambient Occlusion maximum radius for each quality level.</summary>
+        /// <summary>Ambient Occlusion maximum radius for each quality level. The array must have one entry per scalable setting level, and elements must be between 16 and 256.</summary>
+        [Range(16, 256)]
         public int[] AOMaximumRadiusPixels = new int[s_QualitySettingCount];
-        /// <summary>Ambient Occlusion uses bilateral upsample for each quality level.</summary>
+        /// <summary>Ambient Occlusion uses bilateral upsample for each quality level. The array must have one entry per scalable setting level.</summary>
         public bool[] AOBilateralUpsample = new bool[s_QualitySettingCount];
-        /// <summary>Ambient Occlusion direction count for each quality level.</summary>
+        /// <summary>Ambient Occlusion direction count for each quality level. The array must have one entry per scalable setting level, and elements must be between 1 and 6.</summary>
+        [Range(1, 6)]
         public int[] AODirectionCount = new int[s_QualitySettingCount];
 
         // Contact Shadows
-        /// <summary>Contact shadow sample count for each quality level.</summary>
+        /// <summary>Contact shadow sample count for each quality level. The array must have one entry per scalable setting level, and elements must be between 4 and 64.</summary>
+        [Range(4, 64)]
         public int[] ContactShadowSampleCount = new int[s_QualitySettingCount];
 
         // Screen Space Reflections
-        /// <summary>Maximum number of rays for Screen Space Reflection for each quality level.</summary>
+        /// <summary>Maximum number of rays for Screen Space Reflection for each quality level. The array must have one entry per scalable setting level, and elements must above 0.</summary>
+        [Min(0)]
         public int[] SSRMaxRaySteps = new int[s_QualitySettingCount];
 
         // Screen Space Global Illumination
-        /// <summary>Screen space global illumination step count for the ray marching.</summary>
+        /// <summary>Screen space global illumination step count for the ray marching. The array must have one entry per scalable setting level, and elements must above 0.</summary>
+        [Min(0)]
         public int[] SSGIRaySteps = new int[s_QualitySettingCount];
+
         /// <summary>Flag that enables the first denoising pass.</summary>
         public bool[] SSGIDenoise = new bool[s_QualitySettingCount];
         /// <summary>Flag that defines if the denoiser should be evaluated at half resolution.</summary>
@@ -204,62 +211,79 @@ internal GlobalLightingQualitySettings()
         public bool[] SSGISecondDenoise = new bool[s_QualitySettingCount];
 
         // Ray Traced Ambient Occlusion
-        /// <summary>Controls the length of ray traced ambient occlusion rays.</summary>
+        /// <summary>Controls the length of ray traced ambient occlusion rays. The array must have one entry per scalable setting level, and elements must above 0.01.</summary>
+        [Min(0.01f)]
         public float[] RTAORayLength = new float[s_QualitySettingCount];
-        /// <summary>Number of samples for evaluating the effect.</summary>
+        /// <summary>Number of samples for evaluating the effect. The array must have one entry per scalable setting level, and elements must be between 1 and 64.</summary>
+        [Range(1, 64)]
         public int[] RTAOSampleCount = new int[s_QualitySettingCount];
-        /// <summary>Defines if the ray traced ambient occlusion should be denoised.</summary>
+        /// <summary>Defines if the ray traced ambient occlusion should be denoised. The array must have one entry per scalable setting level.</summary>
         public bool[] RTAODenoise = new bool[s_QualitySettingCount];
-        /// <summary>Controls the radius of the ray traced ambient occlusion denoiser.</summary>
+        /// <summary>Controls the radius of the ray traced ambient occlusion denoiser. The array must have one entry per scalable setting level, and elements must be between 0.001 and 1.</summary>
+        [Range(0.001f, 1.0f)]
         public float[] RTAODenoiserRadius = new float[s_QualitySettingCount];
 
         // Ray Traced Global Illumination
-        /// <summary>Controls the length of ray traced global illumination rays.</summary>
+        /// <summary>Controls the length of ray traced global illumination rays. The array must have one entry per scalable setting level, and elements must above 0.01.</summary>
+        [Min(0.01f)]
         public float[] RTGIRayLength = new float[s_QualitySettingCount];
-        /// <summary>Controls if the effect should be computed at full resolution.</summary>
+        /// <summary>Controls if the effect should be computed at full resolution. The array must have one entry per scalable setting level.</summary>
         public bool[] RTGIFullResolution = new bool[s_QualitySettingCount];
-        /// <summary>Clamp value used to reduce the variance in the integration signal.</summary>
+        /// <summary>Clamp value used to reduce the variance in the integration signal. The array must have one entry per scalable setting level, and elements must be between 0.001 and 10.</summary>
+        [Range(0.001f, 10.0f)]
         public float[] RTGIClampValue = new float[s_QualitySettingCount];
-        /// <summary>Radius for the up-sample pass.</summary>
+        /// <summary>Radius for the up-sample pass. The array must have one entry per scalable setting level, and elements must be between 2 and 4.</summary>
+        [Range(2, 4)]
         public int[] RTGIUpScaleRadius = new int[s_QualitySettingCount];
-        /// <summary>Controls the number of ray steps for hybrid tracing.</summary>
+        /// <summary>Controls the number of ray steps for hybrid tracing. The array must have one entry per scalable setting level, and elements must above 0.</summary>
+        [Min(0)]
         public int[] RTGIRaySteps = new int[s_QualitySettingCount];
-        /// <summary>Flag that enables the first denoising pass.</summary>
+        /// <summary>Flag that enables the first denoising pass. The array must have one entry per scalable setting level.</summary>
         public bool[] RTGIDenoise = new bool[s_QualitySettingCount];
-        /// <summary>Flag that defines if the denoiser should be evaluated at half resolution.</summary>
+        /// <summary>Flag that defines if the denoiser should be evaluated at half resolution. The array must have one entry per scalable setting level.</summary>
         public bool[] RTGIHalfResDenoise = new bool[s_QualitySettingCount];
-        /// <summary>Flag that defines the radius of the first denoiser.</summary>
+        /// <summary>Flag that defines the radius of the first denoiser. The array must have one entry per scalable setting level, and elements must be between 0.001 and 1.0.</summary>
+        [Range(0.001f, 1.0f)]
         public float[] RTGIDenoiserRadius = new float[s_QualitySettingCount];
-        /// <summary>Flag that enables the second denoising pass.</summary>
+        /// <summary>Flag that enables the second denoising pass. The array must have one entry per scalable setting level.</summary>
         public bool[] RTGISecondDenoise = new bool[s_QualitySettingCount];
 
         // Ray Traced Reflections
-        /// <summary>Controls the minimal smoothness.</summary>
+        /// <summary>Controls the minimal smoothness. The array must have one entry per scalable setting level, and elements must be between 0 and 1.</summary>
+        [Range(0.0f, 1.0f)]
         public float[] RTRMinSmoothness = new float[s_QualitySettingCount];
-        /// <summary>Controls the minimal smoothness.</summary>
+        /// <summary>Controls the minimal smoothness. The array must have one entry per scalable setting level, and elements must be between 0 and 1.</summary>
+        [Range(0.0f, 1.0f)]
         public float[] RTRSmoothnessFadeStart = new float[s_QualitySettingCount];
-        /// <summary>Controls the length of ray traced reflection rays.</summary>
+        /// <summary>Controls the length of ray traced reflection rays. The array must have one entry per scalable setting level, and elements must above 0.01.</summary>
+        [Min(0.01f)]
         public float[] RTRRayLength = new float[s_QualitySettingCount];
-        /// <summary>Clamp value used to reduce the variance in the integration signal.</summary>
+        /// <summary>Clamp value used to reduce the variance in the integration signal. The array must have one entry per scalable setting level, and elements must be between 0.001 and 10.</summary>
+        [Range(0.001f, 10.0f)]
         public float[] RTRClampValue = new float[s_QualitySettingCount];
-        /// <summary>Controls if the effect should be computed at full resolution.</summary>
+        /// <summary>Controls if the effect should be computed at full resolution. The array must have one entry per scalable setting level.</summary>
         public bool[] RTRFullResolution = new bool[s_QualitySettingCount];
-        /// <summary>Controls if the effect should be computed at full resolution.</summary>
+        /// <summary>Controls if the effect should be computed at full resolution. The array must have one entry per scalable setting level, and elements must above 0.</summary>
+        [Min(0)]
         public int[] RTRRayMaxIterations = new int[s_QualitySettingCount];
-        /// <summary>Flag that enables the first denoising pass.</summary>
+        /// <summary>Flag that enables the first denoising pass. The array must have one entry per scalable setting level.</summary>
         public bool[] RTRDenoise = new bool[s_QualitySettingCount];
-        /// <summary>Flag that defines the radius of the first denoiser.</summary>
+        /// <summary>Flag that defines the radius of the first denoiser. The array must have one entry per scalable setting level, and elements must be between 1 and 32.</summary>
+        [Range(1, 32)]
         public int[] RTRDenoiserRadius = new int[s_QualitySettingCount];
-        /// <summary>Flag that defines smooth denoising status.</summary>
+        /// <summary>Flag that defines smooth denoising status. The array must have one entry per scalable setting level.</summary>
         public bool[] RTRSmoothDenoising = new bool[s_QualitySettingCount];
 
         // TODO: Volumetric fog quality
-        /// <summary>Controls which control mode should be used to define the volumetric fog parameters.</summary>
+        /// <summary>Controls which control mode should be used to define the volumetric fog parameters. The array must have one entry per scalable setting level.</summary>
         public FogControl[] Fog_ControlMode = new FogControl[s_QualitySettingCount];
-        /// <summary>Controls the budget of the volumetric fog effect.</summary>
+        /// <summary>Controls the budget of the volumetric fog effect. The array must have one entry per scalable setting level, and elements must be between 0 and 1.</summary>
+        [Range(0.0f, 1.0f)]
         public float[] Fog_Budget = new float[s_QualitySettingCount];
-        /// <summary>Controls how the budget is shared between screen resolution and depth.</summary>
+        /// <summary>Controls how the budget is shared between screen resolution and depth. The array must have one entry per scalable setting level, and elements must be between 0 and 1.</summary>
+        [Range(0.0f, 1.0f)]
         public float[] Fog_DepthRatio = new float[s_QualitySettingCount];
+
         // TODO: Shadows. This needs to be discussed further as there is an idiosyncracy here as we have different level of quality settings,
         //some for resolution per light (4 levels) some per volume (which are 3 levels everywhere). This needs to be discussed more.
     }