diff --git a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md index ebb4ee83b30..c883e680f1a 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md +++ b/Packages/com.unity.render-pipelines.high-definition/Documentation~/Override-Volumetric-Clouds.md @@ -78,9 +78,9 @@ When importing these two map Textures, disable **sRGB**. For best results, do no | --------------------------------- | ------------------------------------------------------------ | | **Cloud Control** | Specifies the mode to control volumetric cloud properties. The options are:
• **Simple**: Uses sliders and input fields to customize volumetric cloud shape properties. This mode generates a cloud map from the various properties and uses HDRP's internal cloud lookup table.
• **Advanced**: Uses separate Textures to specify each cloud type and their coverage. This mode generates a cloud map from the various Textures and uses HDRP's internal cloud lookup table.
• **Manual**: Uses the cloud map and lookup table you supply to render the clouds. For more information on the cloud map and cloud lookup table, see [Cloud map and cloud lookup table](#cloud-map-and-cloud-lookup-table). | | - **Cloud Preset** | Specifies the preset to apply to the **Simple** mode properties. The options are:
• **Sparse**: Smaller clouds that are spread apart.
• **Cloudy**: Medium-sized clouds that partially cover the sky.
• **Overcast**: A light layer of cloud that covers the entire sky. Some areas are less dense and let more light through, whereas other areas are more dense and appear darker.
• **Storm Clouds**: Large dark clouds that cover most of the sky.
• **Custom**: Exposes properties that control the shape of the clouds.

This property only appears if you set **Cloud Control** to **Simple**. | -| - **Custom Density Curve** | Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| -| - **Custom Erosion Curve** | Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| -| - **Custom Ambient Occlusion Curve** | Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple** and then set **Cloud Preset** to **Custom**.| +| - **Density Curve** | Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple**.| +| - **Erosion Curve** | Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple**.| +| - **Ambient Occlusion Curve** | Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.

This property only appears if you set **Cloud Control** to **Simple**.| | - **Cumulus Map** | Specifies a Texture that defines the distribution of clouds in the lower layer.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Cumulus Map Multiplier** | The multiplier for the clouds specified in the **Cumulus Map**. A value of **0** completely hides the cumulus clouds.

This property only appears if you set **Cloud Control** to **Advanced**. | | - **Alto Stratus Map** | Specifies a Texture that defines the distribution of clouds in the higher layer.

This property only appears if you set **Cloud Control** to **Advanced**. | @@ -102,8 +102,8 @@ When importing these two map Textures, disable **sRGB**. For best results, do no | - **Erosion Factor** | Controls the amount of erosion to apply on the edge of the clouds. A higher value erodes clouds more significantly.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | - **Erosion Scale** | Controls the size of the noise HDRP uses in the erosion stage to add local details to the cloud edges.

This property only appears if you set **Cloud Control** to **Advanced** or **Custom**, or if you set it to **Simple** and then set **Cloud Preset** to **Custom**. | | **Earth Curvature** | The curvature of the cloud volume. This defines the distance at which the clouds intersect with the horizon. | -| **Lowest Cloud Altitude** | The altitude of the lowest cloud in meters. | -| **Cloud Thickness** | The thickness of the volumetric clouds volume in meters. | +| **Bottom Altitude** | Controls the altitude of the bottom of the volumetric clouds volume in meters.| +| **Altitude Range** | Controls the size of the volumetric clouds volume in meters. | | **Fade In Mode** | Controls the mode in which the clouds fade in when close to the camera's near plane.| | **Fade In Start** | Controls the minimal distance at which clouds start appearing.| | **Fade In Distance** | Controls the distance that it takes for the clouds to reach their complete density.| diff --git a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs index 5fbaf918661..5e74bb6298f 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Editor/Lighting/VolumetricLighting/VolumetricCloudsEditor.cs @@ -17,9 +17,9 @@ class VolumetricCloudsEditor : VolumeComponentEditor SerializedDataParameter m_CloudControl; SerializedDataParameter m_CloudPreset; - SerializedDataParameter m_CustomDensityCurve; - SerializedDataParameter m_CustomErosionCurve; - SerializedDataParameter m_CustomAmbientOcclusionCurve; + SerializedDataParameter m_DensityCurve; + SerializedDataParameter m_ErosionCurve; + SerializedDataParameter m_AmbientOcclusionCurve; SerializedDataParameter m_CumulusMap; SerializedDataParameter m_CumulusMapMultiplier; @@ -37,8 +37,8 @@ class VolumetricCloudsEditor : VolumeComponentEditor SerializedDataParameter m_CloudTiling; SerializedDataParameter m_CloudOffset; - SerializedDataParameter m_LowestCloudAltitude; - SerializedDataParameter m_CloudThickness; + SerializedDataParameter m_BottomAltitude; + SerializedDataParameter m_AltitudeRange; SerializedDataParameter m_FadeInMode; SerializedDataParameter m_FadeInStart; SerializedDataParameter m_FadeInDistance; @@ -95,9 +95,9 @@ public override void OnEnable() m_CloudControl = Unpack(o.Find(x => x.cloudControl)); m_CloudPreset = Unpack(o.Find(x => x.cloudPreset)); - m_CustomDensityCurve = Unpack(o.Find(x => x.customDensityCurve)); - m_CustomErosionCurve = Unpack(o.Find(x => x.customErosionCurve)); - m_CustomAmbientOcclusionCurve = Unpack(o.Find(x => x.customAmbientOcclusionCurve)); + m_DensityCurve = Unpack(o.Find(x => x.densityCurve)); + m_ErosionCurve = Unpack(o.Find(x => x.erosionCurve)); + m_AmbientOcclusionCurve = Unpack(o.Find(x => x.ambientOcclusionCurve)); m_CumulusMap = Unpack(o.Find(x => x.cumulusMap)); m_CumulusMapMultiplier = Unpack(o.Find(x => x.cumulusMapMultiplier)); @@ -115,8 +115,8 @@ public override void OnEnable() m_CloudTiling = Unpack(o.Find(x => x.cloudTiling)); m_CloudOffset = Unpack(o.Find(x => x.cloudOffset)); - m_LowestCloudAltitude = Unpack(o.Find(x => x.lowestCloudAltitude)); - m_CloudThickness = Unpack(o.Find(x => x.cloudThickness)); + m_BottomAltitude = Unpack(o.Find(x => x.bottomAltitude)); + m_AltitudeRange = Unpack(o.Find(x => x.altitudeRange)); m_FadeInMode = Unpack(o.Find(x => x.fadeInMode)); m_FadeInStart = Unpack(o.Find(x => x.fadeInStart)); @@ -167,6 +167,214 @@ public override void OnEnable() static public readonly GUIContent k_CloudMapOffsetText = EditorGUIUtility.TrTextContent("Cloud Map Offset", "Offset (x,y) of the cloud map."); static public readonly GUIContent k_GlobalHorizontalWindSpeedText = EditorGUIUtility.TrTextContent("Global Horizontal Wind Speed", "Sets the global horizontal wind speed in kilometers per hour.\nThis value can be relative to the Global Wind Speed defined in the Visual Environment."); + void AdvancedControlMode() + { + // Cumulus + PropertyField(m_CumulusMap); + PropertyField(m_CumulusMapMultiplier); + + // Altostratus + PropertyField(m_AltoStratusMap); + PropertyField(m_AltoStratusMapMultiplier); + + // Cumulonimbus + PropertyField(m_CumulonimbusMap); + PropertyField(m_CumulonimbusMapMultiplier); + + // Rain + PropertyField(m_RainMap); + + // Properties of the cloud map + PropertyField(m_CloudMapResolution); + PropertyField(m_CloudTiling, k_CloudMapTilingText); + PropertyField(m_CloudOffset, k_CloudMapOffsetText); + + // Properties of the clouds + PropertyField(m_DensityMultiplier); + PropertyField(m_ShapeFactor); + PropertyField(m_ShapeScale); + PropertyField(m_ErosionFactor); + PropertyField(m_ErosionScale); + PropertyField(m_ErosionNoiseType); + + // Layer properties + PropertyField(m_BottomAltitude); + PropertyField(m_AltitudeRange); + } + + void ManualControlMode() + { + // Properties of the cloud map + PropertyField(m_CloudMap); + PropertyField(m_CloudLut); + PropertyField(m_CloudTiling, k_CloudMapTilingText); + PropertyField(m_CloudOffset, k_CloudMapOffsetText); + + // Properties of the clouds + PropertyField(m_DensityMultiplier); + PropertyField(m_ShapeFactor); + PropertyField(m_ShapeScale); + PropertyField(m_ErosionFactor); + PropertyField(m_ErosionScale); + PropertyField(m_ErosionNoiseType); + + // Layer properties + PropertyField(m_BottomAltitude); + PropertyField(m_AltitudeRange); + } + + void LoadPresetValues(VolumetricClouds.CloudPresets preset) + { + switch (preset) + { + case VolumetricClouds.CloudPresets.Sparse: + { + m_DensityMultiplier.value.floatValue = 0.4f; + m_ShapeFactor.value.floatValue = 0.95f; + m_ShapeScale.value.floatValue = 5.0f; + m_ErosionFactor.value.floatValue = 0.8f; + m_ErosionScale.value.floatValue = 107.0f; + + // Curves + m_DensityCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.05f, 1.0f), new Keyframe(0.75f, 1.0f), new Keyframe(1.0f, 0.0f)); + m_ErosionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0.1f, 0.9f), new Keyframe(1.0f, 1.0f)); + m_AmbientOcclusionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.25f, 0.5f), new Keyframe(1.0f, 0.0f)); + + // Layer properties + m_BottomAltitude.value.floatValue = 3000.0f; + m_AltitudeRange.value.floatValue = 1000.0f; + } + break; + case VolumetricClouds.CloudPresets.Cloudy: + { + m_DensityMultiplier.value.floatValue = 0.4f; + m_ShapeFactor.value.floatValue = 0.9f; + m_ShapeScale.value.floatValue = 5.0f; + m_ErosionFactor.value.floatValue = 0.8f; + m_ErosionScale.value.floatValue = 107.0f; + + // Curves + m_DensityCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.15f, 1.0f), new Keyframe(1.0f, 0.1f)); + m_ErosionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0.1f, 0.9f), new Keyframe(1.0f, 1.0f)); + m_AmbientOcclusionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.25f, 0.4f), new Keyframe(1.0f, 0.0f)); + + // Layer properties + m_BottomAltitude.value.floatValue = 1200.0f; + m_AltitudeRange.value.floatValue = 2000.0f; + } + break; + case VolumetricClouds.CloudPresets.Overcast: + { + m_DensityMultiplier.value.floatValue = 0.3f; + m_ShapeFactor.value.floatValue = 0.5f; + m_ShapeScale.value.floatValue = 5.0f; + m_ErosionFactor.value.floatValue = 0.8f; + m_ErosionScale.value.floatValue = 107.0f; + + // Curves + m_DensityCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.05f, 1.0f), new Keyframe(0.9f, 0.0f), new Keyframe(1.0f, 0.0f)); + m_ErosionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0.1f, 0.9f), new Keyframe(1.0f, 1.0f)); + m_AmbientOcclusionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(1.0f, 0.0f)); + + // Layer properties + m_BottomAltitude.value.floatValue = 1500.0f; + m_AltitudeRange.value.floatValue = 2500.0f; + } + break; + case VolumetricClouds.CloudPresets.Stormy: + { + m_DensityMultiplier.value.floatValue = 0.35f; + m_ShapeFactor.value.floatValue = 0.85f; + m_ShapeScale.value.floatValue = 5.0f; + m_ErosionFactor.value.floatValue = 0.749f; + m_ErosionScale.value.floatValue = 107.0f; + + // Curves + m_DensityCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.037f, 1.0f), new Keyframe(0.6f, 1.0f), new Keyframe(1.0f, 0.0f)); + m_ErosionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0.05f, 0.8f), new Keyframe(0.2438f, 0.9498f), new Keyframe(0.5f, 1.0f), new Keyframe(0.93f, 0.9268f), new Keyframe(1.0f, 1.0f)); + m_AmbientOcclusionCurve.value.animationCurveValue = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.1f, 0.4f), new Keyframe(1.0f, 0.0f)); + + // Layer properties + m_BottomAltitude.value.floatValue = 1000.0f; + m_AltitudeRange.value.floatValue = 5000.0f; + } + break; + default: + break; + } + } + + void SimpleControlMode() + { + // Start checking for changes + EditorGUI.BeginChangeCheck(); + + // Display the preset list + PropertyField(m_CloudPreset); + VolumetricClouds.CloudPresets controlPreset = (VolumetricClouds.CloudPresets)m_CloudPreset.value.enumValueIndex; + + // Has the cloud preset property changed? + if (EditorGUI.EndChangeCheck()) + { + // If it was changed to anything but custom, this means we need to load the values into the volume + if (controlPreset != VolumetricClouds.CloudPresets.Custom) + { + LoadPresetValues(controlPreset); + } + } + + if (controlPreset != VolumetricClouds.CloudPresets.Custom) + { + // If we are in simple mode and the preset button is enabled, we need to enable all the + // subsidiary properties. This is different from the quality settings, all the properties need to be forced + // If a preset is selected and active. + m_DensityMultiplier.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_DensityCurve.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ShapeFactor.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ShapeScale.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ErosionFactor.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ErosionScale.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ErosionNoiseType.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_ErosionCurve.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_AmbientOcclusionCurve.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_BottomAltitude.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + m_AltitudeRange.overrideState.boolValue = m_CloudPreset.overrideState.boolValue; + } + + // Start checking for changes + EditorGUI.BeginChangeCheck(); + + // We can only touch the properties if the preset is overridden on this volume + using (new EditorGUI.DisabledScope(!(m_CloudPreset.overrideState.boolValue))) + { + using (new IndentLevelScope()) + { + PropertyField(m_DensityMultiplier); + PropertyField(m_DensityCurve); + PropertyField(m_ShapeFactor); + PropertyField(m_ShapeScale); + PropertyField(m_ErosionFactor); + PropertyField(m_ErosionScale); + PropertyField(m_ErosionNoiseType); + PropertyField(m_ErosionCurve); + PropertyField(m_AmbientOcclusionCurve); + + // Layer properties + PropertyField(m_BottomAltitude); + PropertyField(m_AltitudeRange); + } + } + + if (EditorGUI.EndChangeCheck()) + { + // Has the any of the properties have changed and we were not in the custom mode, it means we need to switch to the custom mode + if (controlPreset != VolumetricClouds.CloudPresets.Custom) + { + m_CloudPreset.value.enumValueIndex = (int)VolumetricClouds.CloudPresets.Custom; + } + } + } + public override void OnInspectorGUI() { // This whole editor has nothing to display if the SSR feature is not supported @@ -179,7 +387,6 @@ public override void OnInspectorGUI() return; } - EditorGUILayout.LabelField("General", EditorStyles.miniLabel); PropertyField(m_Enable); PropertyField(m_LocalClouds); @@ -193,64 +400,20 @@ public override void OnInspectorGUI() bool hasCloudMap = true; using (new IndentLevelScope()) { - bool needsIntendation = false; if (controlMode == VolumetricClouds.CloudControl.Advanced) - { - PropertyField(m_CumulusMap); - PropertyField(m_CumulusMapMultiplier); - PropertyField(m_AltoStratusMap); - PropertyField(m_AltoStratusMapMultiplier); - PropertyField(m_CumulonimbusMap); - PropertyField(m_CumulonimbusMapMultiplier); - PropertyField(m_RainMap); - PropertyField(m_CloudMapResolution); - PropertyField(m_CloudTiling, k_CloudMapTilingText); - PropertyField(m_CloudOffset, k_CloudMapOffsetText); - } + AdvancedControlMode(); else if (controlMode == VolumetricClouds.CloudControl.Manual) - { - PropertyField(m_CloudMap); - PropertyField(m_CloudLut); - PropertyField(m_CloudTiling, k_CloudMapTilingText); - PropertyField(m_CloudOffset, k_CloudMapOffsetText); - } + ManualControlMode(); else { hasCloudMap = false; - needsIntendation = true; - PropertyField(m_CloudPreset); + SimpleControlMode(); } - - VolumetricClouds.CloudPresets controlPreset = (VolumetricClouds.CloudPresets)m_CloudPreset.value.enumValueIndex; - if ((controlMode != VolumetricClouds.CloudControl.Simple) || controlMode == VolumetricClouds.CloudControl.Simple && controlPreset == VolumetricClouds.CloudPresets.Custom) - { - using (new IndentLevelScope(needsIntendation ? 16 : 0)) - { - PropertyField(m_DensityMultiplier); - if (controlMode == VolumetricClouds.CloudControl.Simple) - { - PropertyField(m_CustomDensityCurve); - } - PropertyField(m_ShapeFactor); - PropertyField(m_ShapeScale); - PropertyField(m_ShapeOffset); - PropertyField(m_ErosionFactor); - PropertyField(m_ErosionScale); - PropertyField(m_ErosionNoiseType); - if (controlMode == VolumetricClouds.CloudControl.Simple) - { - PropertyField(m_CustomErosionCurve); - PropertyField(m_CustomAmbientOcclusionCurve); - } - } - } - else - PropertyField(m_ShapeOffset); } + // Additional properties + PropertyField(m_ShapeOffset); PropertyField(m_EarthCurvature); - PropertyField(m_LowestCloudAltitude); - PropertyField(m_CloudThickness); DrawHeader("Wind"); PropertyField(m_GlobalWindSpeed, k_GlobalHorizontalWindSpeedText); diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs index c5fa74b6e03..bc45c68dc44 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/HDRenderPipeline.VolumetricClouds.cs @@ -9,10 +9,7 @@ public partial class HDRenderPipeline ZonalHarmonicsL2 m_PhaseZHClouds; // Cloud preset maps - Texture2D m_SparsePresetMap; - Texture2D m_CloudyPresetMap; - Texture2D m_OvercastPresetMap; - Texture2D m_StormyPresetMap; + Texture2D m_CustomPresetMap; Texture2D m_CustomLutPresetMap; const int k_CustomLutMapResolution = 32; readonly Color[] m_CustomLutColorArray = new Color[k_CustomLutMapResolution]; @@ -106,22 +103,9 @@ void ReleaseVolumetricClouds() void AllocatePresetTextures() { - // Build our default cloud map - m_SparsePresetMap = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_UNorm, TextureCreationFlags.None) { name = "Default Sparse Texture" }; - m_SparsePresetMap.SetPixel(0, 0, new Color(0.9f, 0.0f, 0.0625f, 1.0f)); - m_SparsePresetMap.Apply(); - - m_CloudyPresetMap = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_UNorm, TextureCreationFlags.None) { name = "Default Cloudy Texture" }; - m_CloudyPresetMap.SetPixel(0, 0, new Color(0.9f, 0.0f, 0.25f, 1.0f)); - m_CloudyPresetMap.Apply(); - - m_OvercastPresetMap = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_UNorm, TextureCreationFlags.None) { name = "Default Overcast Texture" }; - m_OvercastPresetMap.SetPixel(0, 0, new Color(0.9f, 0.0f, 0.25f, 1.0f)); - m_OvercastPresetMap.Apply(); - - m_StormyPresetMap = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_UNorm, TextureCreationFlags.None) { name = "Default Storm Texture" }; - m_StormyPresetMap.SetPixel(0, 0, new Color(1.0f, 0.0f, 0.85f, 1.0f)); - m_StormyPresetMap.Apply(); + m_CustomPresetMap = new Texture2D(1, 1, GraphicsFormat.R8G8B8A8_UNorm, TextureCreationFlags.None) { name = "Default Cloud Map Texture" }; + m_CustomPresetMap.SetPixel(0, 0, new Color(0.9f, 0.0f, 0.25f, 1.0f)); + m_CustomPresetMap.Apply(); } float Square(float x) @@ -229,9 +213,9 @@ void PrepareCustomLutData(in VolumetricClouds clouds) var pixels = m_CustomLutColorArray; - var densityCurve = clouds.customDensityCurve.value; - var erosionCurve = clouds.customErosionCurve.value; - var ambientOcclusionCurve = clouds.customAmbientOcclusionCurve.value; + var densityCurve = clouds.densityCurve.value; + var erosionCurve = clouds.erosionCurve.value; + var ambientOcclusionCurve = clouds.ambientOcclusionCurve.value; if (densityCurve == null || densityCurve.length == 0) { for (int i = 0; i < k_CustomLutMapResolution; i++) @@ -276,26 +260,12 @@ static bool VolumetricCloudsRequireMaxZ(HDCamera hdCamera) return HasVolumetricClouds(hdCamera, in settings) && !settings.localClouds.value; } - Texture2D GetPresetCloudMapTexture(VolumetricClouds.CloudPresets preset) + Texture2D GetPresetCloudMapTexture() { // Textures may become null if a new scene was loaded in the editor (and maybe other reasons). - if (m_SparsePresetMap == null || Object.ReferenceEquals(m_SparsePresetMap, null)) + if (m_CustomPresetMap == null || Object.ReferenceEquals(m_CustomPresetMap, null)) AllocatePresetTextures(); - - switch (preset) - { - case VolumetricClouds.CloudPresets.Sparse: - return m_SparsePresetMap; - case VolumetricClouds.CloudPresets.Cloudy: - return m_CloudyPresetMap; - case VolumetricClouds.CloudPresets.Overcast: - return m_OvercastPresetMap; - case VolumetricClouds.CloudPresets.Stormy: - return m_StormyPresetMap; - case VolumetricClouds.CloudPresets.Custom: - return m_CloudyPresetMap; - } - return Texture2D.blackTexture; + return m_CustomPresetMap; } internal enum TVolumetricCloudsCameraType @@ -328,19 +298,12 @@ TVolumetricCloudsCameraType GetCameraType(HDCamera hdCamera) CloudModelData GetCloudModelData(VolumetricClouds settings) { CloudModelData cloudModelData; - if (settings.cloudControl.value == VolumetricClouds.CloudControl.Simple && settings.cloudPreset.value != VolumetricClouds.CloudPresets.Custom) - { - GetPresetCloudMapValues(settings.cloudPreset.value, out cloudModelData); - } - else - { - cloudModelData.densityMultiplier = settings.densityMultiplier.value; - cloudModelData.shapeFactor = settings.shapeFactor.value; - cloudModelData.shapeScale = settings.shapeScale.value; - cloudModelData.erosionFactor = settings.erosionFactor.value; - cloudModelData.erosionScale = settings.erosionScale.value; - cloudModelData.erosionNoise = settings.erosionNoiseType.value; - } + cloudModelData.densityMultiplier = settings.densityMultiplier.value; + cloudModelData.shapeFactor = settings.shapeFactor.value; + cloudModelData.shapeScale = settings.shapeScale.value; + cloudModelData.erosionFactor = settings.erosionFactor.value; + cloudModelData.erosionScale = settings.erosionScale.value; + cloudModelData.erosionNoise = settings.erosionNoiseType.value; return cloudModelData; } @@ -348,21 +311,21 @@ void UpdateShaderVariableslClouds(ref ShaderVariablesClouds cb, HDCamera hdCamer in VolumetricCloudsCameraData cameraData, in CloudModelData cloudModelData, bool shadowPass) { // Convert to kilometers - cb._LowestCloudAltitude = settings.lowestCloudAltitude.value; + cb._LowestCloudAltitude = settings.bottomAltitude.value; // When in non local mode, the camera is supposed to be always stricly under the clouds - // to avoid artifactss due to precision issues, when in non local, the clouds are always 1 meter above the camera. + // to avoid artifacts due to precision issues, when in non local, the clouds are always 1 meter above the camera. if (!settings.localClouds.value) cb._LowestCloudAltitude = Mathf.Max(cb._LowestCloudAltitude, 1.0f); - cb._HighestCloudAltitude = cb._LowestCloudAltitude + settings.cloudThickness.value; + cb._HighestCloudAltitude = cb._LowestCloudAltitude + settings.altitudeRange.value; cb._EarthRadius = Mathf.Lerp(1.0f, 0.025f, settings.earthCurvature.value) * k_EarthRadius; cb._CloudRangeSquared.Set(Square(cb._LowestCloudAltitude + cb._EarthRadius), Square(cb._HighestCloudAltitude + cb._EarthRadius)); cb._NumPrimarySteps = settings.numPrimarySteps.value; cb._NumLightSteps = settings.numLightSteps.value; // 1000.0f is the maximal distance that a single step can do in theory (otherwise we endup skipping large clouds) - cb._MaxRayMarchingDistance = Mathf.Min(settings.cloudThickness.value / 8.0f * cb._NumPrimarySteps, hdCamera.camera.farClipPlane); + cb._MaxRayMarchingDistance = Mathf.Min(settings.altitudeRange.value / 8.0f * cb._NumPrimarySteps, hdCamera.camera.farClipPlane); cb._CloudMapTiling.Set(settings.cloudTiling.value.x, settings.cloudTiling.value.y, settings.cloudOffset.value.x, settings.cloudOffset.value.y); cb._ScatteringTint = Color.white - settings.scatteringTint.value * 0.75f; @@ -559,14 +522,9 @@ void FillVolumetricCloudsCommonData(bool enableExposureControl, VolumetricClouds // Static textures if (settings.cloudControl.value == VolumetricClouds.CloudControl.Simple) { - commonData.cloudMapTexture = GetPresetCloudMapTexture(settings.cloudPreset.value); - if (settings.cloudPreset.value == VolumetricClouds.CloudPresets.Custom) - { - PrepareCustomLutData(settings); - commonData.cloudLutTexture = m_CustomLutPresetMap; - } - else - commonData.cloudLutTexture = m_Asset.renderPipelineResources.textures.cloudLutRainAO; + commonData.cloudMapTexture = GetPresetCloudMapTexture(); + PrepareCustomLutData(settings); + commonData.cloudLutTexture = m_CustomLutPresetMap; } else if (settings.cloudControl.value == VolumetricClouds.CloudControl.Advanced) { diff --git a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs index e09bd1f85ed..048f7478c01 100644 --- a/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs +++ b/Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/VolumetricLighting/VolumetricClouds.cs @@ -214,13 +214,13 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals /// Controls the altitude of the bottom of the volumetric clouds volume in meters. /// [Tooltip("Controls the altitude of the bottom of the volumetric clouds volume in meters.")] - public MinFloatParameter lowestCloudAltitude = new MinFloatParameter(1000.0f, 0.01f); + public MinFloatParameter bottomAltitude = new MinFloatParameter(1200.0f, 0.01f); /// - /// Controls the thickness of the volumetric clouds volume in meters. + /// Controls the size of the volumetric clouds volume in meters. /// - [Tooltip("Controls the thickness of the volumetric clouds volume in meters.")] - public MinFloatParameter cloudThickness = new MinFloatParameter(8000.0f, 100.0f); + [Tooltip("Controls the size of the volumetric clouds volume in meters.")] + public MinFloatParameter altitudeRange = new MinFloatParameter(2000.0f, 100.0f); /// /// Controls the mode in which the clouds fade in when close to the camera's near plane. @@ -328,19 +328,19 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals /// Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume. /// [Tooltip("Controls the density (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.")] - public AnimationCurveParameter customDensityCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.2f, 1.0f), new Keyframe(0.5f, 0.7f), new Keyframe(0.8f, 1.0f), new Keyframe(1.0f, 0.0f)), false); + public AnimationCurveParameter densityCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.15f, 1.0f), new Keyframe(1.0f, 0.1f)), false); /// /// Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume. /// [Tooltip("Controls the erosion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.")] - public AnimationCurveParameter customErosionCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 0.9f), new Keyframe(0.2f, 1.0f), new Keyframe(0.8f, 1.0f), new Keyframe(1.0f, 0.9f)), false); + public AnimationCurveParameter erosionCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0.1f, 0.9f), new Keyframe(1.0f, 1.0f)), false); /// /// Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume. /// [Tooltip("Controls the ambient occlusion (Y axis) of the volumetric clouds as a function of the height (X Axis) inside the cloud volume.")] - public AnimationCurveParameter customAmbientOcclusionCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 1f), new Keyframe(0f, 0f), new Keyframe(1.0f, 0.0f)), false); + public AnimationCurveParameter ambientOcclusionCurve = new AnimationCurveParameter(new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(0.25f, 0.4f), new Keyframe(1.0f, 0.0f)), false); /// /// Specifies the tint of the cloud scattering color. @@ -366,19 +366,19 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals /// Controls the global density of the cloud volume. /// [Tooltip("Controls the global density of the cloud volume.")] - public ClampedFloatParameter densityMultiplier = new ClampedFloatParameter(0.25f, 0.0f, 1.0f); + public ClampedFloatParameter densityMultiplier = new ClampedFloatParameter(0.4f, 0.0f, 1.0f); /// /// Controls the larger noise passing through the cloud coverage. A higher value will yield less cloud coverage and smaller clouds. /// [Tooltip("Controls the larger noise passing through the cloud coverage. A higher value will yield less cloud coverage and smaller clouds.")] - public ClampedFloatParameter shapeFactor = new ClampedFloatParameter(0.75f, 0.0f, 1.0f); + public ClampedFloatParameter shapeFactor = new ClampedFloatParameter(0.9f, 0.0f, 1.0f); /// /// Controls the size of the larger noise passing through the cloud coverage. /// [Tooltip("Controls the size of the larger noise passing through the cloud coverage.")] - public MinFloatParameter shapeScale = new MinFloatParameter(2.5f, 0.1f); + public MinFloatParameter shapeScale = new MinFloatParameter(5.0f, 0.1f); /// /// Controls the world space offset applied when evaluating the larger noise passing through the cloud coverage. @@ -390,13 +390,13 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals /// Controls the smaller noise on the edge of the clouds. A higher value will erode clouds more significantly. /// [Tooltip("Controls the smaller noise on the edge of the clouds. A higher value will erode clouds more significantly.")] - public ClampedFloatParameter erosionFactor = new ClampedFloatParameter(0.5f, 0.0f, 1.0f); + public ClampedFloatParameter erosionFactor = new ClampedFloatParameter(0.8f, 0.0f, 1.0f); /// /// Controls the size of the smaller noise passing through the cloud coverage. /// [Tooltip("Controls the size of the smaller noise passing through the cloud coverage.")] - public MinFloatParameter erosionScale = new MinFloatParameter(50.0f, 1.0f); + public MinFloatParameter erosionScale = new MinFloatParameter(107.0f, 1.0f); /// /// Controls the type of noise used to generate the smaller noise passing through the cloud coverage. @@ -441,7 +441,7 @@ public CloudFadeInModeParameter(CloudFadeInMode value, bool overrideState = fals /// [AdditionalProperty] [Tooltip("Controls the intensity of the wind-based altitude distortion of the clouds.")] - public ClampedFloatParameter altitudeDistortion = new ClampedFloatParameter(0.5f, -1.0f, 1.0f); + public ClampedFloatParameter altitudeDistortion = new ClampedFloatParameter(0.25f, -1.0f, 1.0f); /// /// Controls the multiplier to the speed of the cloud map. diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals.unity b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals.unity index f63bfd1084a..a2af38fe080 100644 --- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals.unity +++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 2155.1436, g: 2259.377, b: 3297.3477, a: 1} + m_IndirectSpecularColor: {r: 2157.715, g: 2259.8752, b: 3277.4185, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -345,6 +345,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: -4216859302048453862, guid: ea914b7fecb1b6048a6d5227cff39185, @@ -428,6 +429,8 @@ PrefabInstance: value: Lucy_L objectReference: {fileID: 0} m_RemovedComponents: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ea914b7fecb1b6048a6d5227cff39185, type: 3} --- !u!1 &432432459 GameObject: @@ -458,7 +461,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -623,7 +626,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} m_Name: m_EditorClassIdentifier: - isGlobal: 1 + m_IsGlobal: 1 priority: 0 blendDistance: 0 weight: 1 @@ -763,6 +766,7 @@ MonoBehaviour: type: 1 mode: 1 realtimeMode: 0 + timeSlicing: 0 lighting: multiplier: 1 weight: 1 @@ -1009,6 +1013,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_HasValidSHForNormalization: 0 m_SHForNormalization: sh[ 0]: 0 sh[ 1]: 0 @@ -1037,7 +1042,8 @@ MonoBehaviour: sh[24]: 0 sh[25]: 0 sh[26]: 0 - m_HasValidSHForNormalization: 0 + m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -1744,9 +1750,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -1817,6 +1831,7 @@ MonoBehaviour: taaAntiFlicker: 0.5 taaMotionVectorRejection: 0 taaAntiHistoryRinging: 0 + taaBaseBlendFactor: 0.875 physicalParameters: m_Iso: 200 m_ShutterSpeed: 0.005 @@ -1842,6 +1857,8 @@ MonoBehaviour: deepLearningSuperSamplingUseCustomAttributes: 0 deepLearningSuperSamplingUseOptimalSettings: 1 deepLearningSuperSamplingSharpening: 0 + fsrOverrideSharpness: 0 + fsrSharpness: 0.92 exposureTarget: {fileID: 0} materialMipBias: 0 m_RenderingPathCustomFrameSettings: @@ -1864,7 +1881,7 @@ MonoBehaviour: data1: 0 data2: 0 defaultFrameSettings: 0 - m_Version: 8 + m_Version: 9 m_ObsoleteRenderingPath: 0 m_ObsoleteFrameSettings: overrides: 0 @@ -1946,6 +1963,7 @@ MonoBehaviour: checkMemoryAllocation: 0 renderPipelineAsset: {fileID: 11400000, guid: 6bd5fa45cda106547a3123d7cb302682, type: 2} + forceCameraRenderDuringSetup: 0 --- !u!1 &1988140875 GameObject: m_ObjectHideFlags: 0 @@ -2036,6 +2054,7 @@ MonoBehaviour: m_Profile: {fileID: 11400000, guid: e3102139b0c3d9f4abd42dce42febd82, type: 2} m_StaticLightingSkyUniqueID: 4 m_StaticLightingCloudsUniqueID: 0 + m_StaticLightingVolumetricClouds: 0 --- !u!4 &2013410475 Transform: m_ObjectHideFlags: 1 diff --git a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals/Clouds Profile.asset b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals/Clouds Profile.asset index 143db9d2f95..2bf70dd5ce4 100644 --- a/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals/Clouds Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_RuntimeTests/Assets/Scenes/004-CloudsFlaresDecals/Clouds Profile.asset @@ -28,12 +28,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 1 m_Value: {x: 0, y: 0} - lowestCloudAltitude: + bottomAltitude: m_OverrideState: 1 - m_Value: 1000 - cloudThickness: + m_Value: 1200 + altitudeRange: m_OverrideState: 1 - m_Value: 6000 + m_Value: 2000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -85,8 +85,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 1 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -100,16 +100,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.15 value: 1 inSlope: 0 outSlope: 0 @@ -119,7 +110,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -129,14 +120,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -144,8 +135,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -164,14 +155,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -179,8 +170,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.25 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -210,24 +201,24 @@ MonoBehaviour: m_Value: 0.5 densityMultiplier: m_OverrideState: 1 - m_Value: 0.25 + m_Value: 0.4 shapeFactor: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 0.9 shapeScale: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 5 shapeOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0, z: 0} erosionFactor: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 0.8 erosionScale: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/HDRPAssetClouds.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/HDRPAssetClouds.asset index ff850d6d5c3..7a2d4cef95e 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/HDRPAssetClouds.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/HDRPAssetClouds.asset @@ -26,6 +26,9 @@ MonoBehaviour: supportVolumetrics: 1 supportVolumetricClouds: 1 supportLightLayers: 0 + supportWater: 0 + waterSimulationResolution: 128 + waterCPUSimulation: 0 supportDistortion: 1 supportTransparentBackface: 1 supportTransparentDepthPrepass: 1 @@ -44,12 +47,13 @@ MonoBehaviour: decalNormalBufferHP: 0 msaaSampleCount: 1 supportMotionVectors: 1 - supportRuntimeDebugDisplay: 0 supportRuntimeAOVAPI: 0 supportDitheringCrossFade: 1 supportTerrainHole: 0 - supportProbeVolume: 0 + lightProbeSystem: 0 probeVolumeMemoryBudget: 1024 + probeVolumeBlendingMemoryBudget: 128 + supportProbeVolumeStreaming: 0 probeVolumeSHBands: 1 supportRayTracing: 0 supportedRayTracingMode: 3 @@ -91,6 +95,7 @@ MonoBehaviour: useDynamicViewportRescale: 1 cachedPunctualLightShadowAtlas: 2048 cachedAreaLightShadowAtlas: 1024 + allowDirectionalMixedCachedShadows: 0 shadowResolutionDirectional: m_Values: 00010000000200000004000000080000 m_SchemaId: @@ -125,12 +130,16 @@ MonoBehaviour: DLSSPerfQualitySetting: 0 DLSSUseOptimalSettings: 0 DLSSSharpness: 0 + fsrOverrideSharpness: 0 + fsrSharpness: 0.92 maxPercentage: 100 minPercentage: 100 dynResType: 1 upsampleFilter: 1 forceResolution: 0 forcedPercentage: 100 + lowResTransparencyMinimumThreshold: 0 + rayTracingHalfResThreshold: 50 lowresTransparentSettings: enabled: 1 checkerboardDepthBuffer: 1 @@ -139,6 +148,7 @@ MonoBehaviour: singlePass: 1 occlusionMesh: 1 cameraJitter: 0 + allowMotionBlur: 0 postProcessQualitySettings: NearBlurSampleCount: 030000000500000008000000 NearBlurMaxRadius: @@ -153,6 +163,7 @@ MonoBehaviour: DoFResolution: 040000000200000001000000 DoFHighQualityFiltering: 000101 DoFPhysicallyBased: 000000 + LimitManualRangeNearBlur: 000000 MotionBlurSampleCount: 04000000080000000c000000 BloomRes: 040000000200000002000000 BloomHighQualityFiltering: 000101 @@ -183,7 +194,13 @@ MonoBehaviour: ContactShadowSampleCount: 060000000a00000010000000 SSRMaxRaySteps: 100000002000000040000000 SSGIRaySteps: 200000004000000080000000 - SSGIFilterRadius: 100000000e0000000c000000 + SSGIDenoise: 010101 + SSGIHalfResDenoise: 010000 + SSGIDenoiserRadius: + - 0.75 + - 0.5 + - 0.5 + SSGISecondDenoise: 010101 RTAORayLength: - 0.5 - 3 @@ -203,7 +220,6 @@ MonoBehaviour: - 0.5 - 0.8 - 1.5 - RTGIUpScaleRadius: 040000000400000004000000 RTGIRaySteps: 200000003000000040000000 RTGIDenoise: 010101 RTGIHalfResDenoise: 010000 @@ -258,6 +274,7 @@ MonoBehaviour: m_ObsoleteDecalLayerName5: m_ObsoleteDecalLayerName6: m_ObsoleteDecalLayerName7: + m_ObsoleteSupportRuntimeDebugDisplay: 0 allowShaderVariantStripping: 1 enableSRPBatcher: 1 availableMaterialQualityLevels: -1 @@ -269,7 +286,7 @@ MonoBehaviour: - format: 0 sizeInMegaBytes: 128 m_UseRenderGraph: 1 - m_Version: 20 + m_Version: 21 m_ObsoleteFrameSettings: overrides: 0 enableShadow: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume0.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume0.asset index c3119bdb5e9..7d3a1d531f8 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume0.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume0.asset @@ -42,12 +42,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: - m_OverrideState: 0 + bottomAltitude: + m_OverrideState: 1 + m_Value: 3000 + altitudeRange: + m_OverrideState: 1 m_Value: 1000 - cloudThickness: - m_OverrideState: 0 - m_Value: 6000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -99,8 +99,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -114,7 +114,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.05 value: 1 inSlope: 0 outSlope: 0 @@ -123,16 +123,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 - value: 0.7 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.75 value: 1 inSlope: 0 outSlope: 0 @@ -152,22 +143,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -176,8 +158,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -186,7 +168,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -196,14 +178,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -211,8 +193,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.25 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -241,32 +223,32 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.5 densityMultiplier: - m_OverrideState: 0 - m_Value: 0.25 + m_OverrideState: 1 + m_Value: 0.4 shapeFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.95 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 0.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.8 erosionScale: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -296,9 +278,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 0 m_Value: 0 @@ -317,10 +308,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 100 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume1.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume1.asset index 2a288a90b14..366b035e088 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume1.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume1.asset @@ -42,12 +42,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: - m_OverrideState: 0 - m_Value: 500 - cloudThickness: - m_OverrideState: 0 - m_Value: 3000 + bottomAltitude: + m_OverrideState: 1 + m_Value: 1000 + altitudeRange: + m_OverrideState: 1 + m_Value: 5000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -99,8 +99,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -114,7 +114,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.037 value: 1 inSlope: 0 outSlope: 0 @@ -123,16 +123,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 - value: 0.7 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.6 value: 1 inSlope: 0 outSlope: 0 @@ -152,14 +143,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -167,8 +158,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 + time: 0.05 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -176,7 +167,16 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 + time: 0.2438 + value: 0.9498 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 value: 1 inSlope: 0 outSlope: 0 @@ -184,9 +184,18 @@ MonoBehaviour: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.93 + value: 0.9268 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -196,14 +205,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -211,8 +220,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.1 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -241,32 +250,32 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.5 densityMultiplier: - m_OverrideState: 0 - m_Value: 0.25 + m_OverrideState: 1 + m_Value: 0.35 shapeFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.85 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 0.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.749 erosionScale: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -296,9 +305,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 1 m_Value: 1 @@ -317,10 +335,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 1 m_Value: 0 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume2.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume2.asset index 82a908e7b74..45057622438 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume2.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume2.asset @@ -42,12 +42,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: + bottomAltitude: m_OverrideState: 0 - m_Value: 500 - cloudThickness: + m_Value: 1200 + altitudeRange: m_OverrideState: 0 - m_Value: 3000 + m_Value: 2000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -99,7 +99,7 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 1 m_Value: 64 - customDensityCurve: + densityCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 @@ -114,16 +114,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.15 value: 1 inSlope: 0 outSlope: 0 @@ -133,7 +124,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -143,14 +134,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: + erosionCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: -1 - value: 0 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -158,8 +149,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -178,13 +169,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: + ambientOcclusionCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: -1 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -193,8 +184,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 1 + time: 0.25 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -203,7 +194,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -231,12 +222,9 @@ MonoBehaviour: shapeScale: m_OverrideState: 1 m_Value: 8.86 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: + shapeOffset: m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: m_OverrideState: 1 m_Value: 0.212 @@ -249,6 +237,9 @@ MonoBehaviour: ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -278,9 +269,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 1 m_Value: 1 @@ -299,10 +299,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 1 m_Value: 0 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume3.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume3.asset index 72426c55f27..cbed5f0e61c 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume3.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricClouds/LocalVolume3.asset @@ -42,12 +42,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: + bottomAltitude: m_OverrideState: 0 - m_Value: 500 - cloudThickness: + m_Value: 1200 + altitudeRange: m_OverrideState: 0 - m_Value: 3000 + m_Value: 2000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -99,7 +99,7 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: + densityCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 @@ -114,16 +114,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.15 value: 1 inSlope: 0 outSlope: 0 @@ -133,7 +124,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -143,14 +134,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: + erosionCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: -1 - value: 0 + time: 0 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -158,8 +149,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -178,13 +169,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: + ambientOcclusionCurve: m_OverrideState: 0 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: -1 + time: 0 value: 0 inSlope: 0 outSlope: 0 @@ -193,8 +184,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 1 + time: 0.25 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -203,7 +194,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -231,12 +222,9 @@ MonoBehaviour: shapeScale: m_OverrideState: 1 m_Value: 2.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: + shapeOffset: m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: m_OverrideState: 0 m_Value: 0.5 @@ -249,6 +237,9 @@ MonoBehaviour: ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -278,9 +269,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 1 m_Value: 1 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 1 m_Value: 1 @@ -299,10 +299,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 1 m_Value: 0 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows/Global Volume Profile.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows/Global Volume Profile.asset index ab630395e05..014eca7e70d 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows/Global Volume Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadows/Global Volume Profile.asset @@ -59,12 +59,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: + bottomAltitude: m_OverrideState: 1 - m_Value: 1000 - cloudThickness: + m_Value: 1200 + altitudeRange: m_OverrideState: 1 - m_Value: 6500 + m_Value: 2000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -116,8 +116,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -131,25 +131,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.7 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.15 value: 1 inSlope: 0 outSlope: 0 @@ -159,7 +141,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 + value: 0.1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -169,22 +151,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -193,8 +166,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -203,7 +176,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -213,14 +186,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -228,8 +201,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.25 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -258,32 +231,32 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.5 densityMultiplier: - m_OverrideState: 0 - m_Value: 0.25 + m_OverrideState: 1 + m_Value: 0.4 shapeFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.9 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 0.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.8 erosionScale: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -313,9 +286,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 1 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 1 m_Value: 1 @@ -334,13 +316,22 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 1 m_Value: 1 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 0 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity index a45feed64b0..f5667593e86 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity @@ -329,6 +329,7 @@ MonoBehaviour: type: 0 mode: 0 realtimeMode: 0 + timeSlicing: 0 lighting: multiplier: 1 weight: 1 @@ -495,7 +496,7 @@ MonoBehaviour: camera: camera: 0 m_ProxyVolume: {fileID: 0} - m_BakedTexture: {fileID: 8900000, guid: 4c2bb9810fd65f34988fcfd11a6be827, type: 3} + m_BakedTexture: {fileID: 8900000, guid: 76b128cf3d7537a4f9d840cd6a95fab4, type: 3} m_CustomTexture: {fileID: 0} m_BakedRenderData: m_WorldToCameraRHS: @@ -575,6 +576,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_HasValidSHForNormalization: 0 m_SHForNormalization: sh[ 0]: 0 sh[ 1]: 0 @@ -603,7 +605,8 @@ MonoBehaviour: sh[24]: 0 sh[25]: 0 sh[26]: 0 - m_HasValidSHForNormalization: 0 + m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -746,6 +749,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - target: {fileID: 1132393308280272, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} @@ -878,6 +882,8 @@ PrefabInstance: value: 0.01 objectReference: {fileID: 0} m_RemovedComponents: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c07ace9ab142ca9469fa377877c2f1e7, type: 3} --- !u!1 &260152580 GameObject: @@ -927,6 +933,57 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &330819907 +GameObject: + m_ObjectHideFlags: 19 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 330819909} + - component: {fileID: 330819908} + m_Layer: 0 + m_Name: SceneIDMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &330819908 +MonoBehaviour: + m_ObjectHideFlags: 19 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330819907} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 783327759} + m_Name: + m_EditorClassIdentifier: + m_Entries: + - id: 0 + category: 0 + gameObject: {fileID: 152581472} + - id: 1 + category: 0 + gameObject: {fileID: 1332358517} +--- !u!4 &330819909 +Transform: + m_ObjectHideFlags: 19 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 330819907} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &402895079 GameObject: m_ObjectHideFlags: 0 @@ -1001,13 +1058,14 @@ MonoScript: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 5 - m_Script: + serializedVersion: 7 m_DefaultReferences: {} m_Icon: {fileID: 0} + m_Type: 2 m_ExecutionOrder: 0 m_ClassName: SceneObjectIDMapSceneAsset m_Namespace: UnityEngine.Rendering.HighDefinition + m_AssemblyName: --- !u!1 &726228995 GameObject: m_ObjectHideFlags: 19 @@ -1156,6 +1214,21 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 755354872} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!115 &783327759 +MonoScript: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 7 + m_DefaultReferences: {} + m_Icon: {fileID: 0} + m_Type: 0 + m_ExecutionOrder: 0 + m_ClassName: SceneObjectIDMapSceneAsset + m_Namespace: UnityEngine.Rendering.HighDefinition + m_AssemblyName: Unity.RenderPipelines.HighDefinition.Runtime --- !u!1 &996408220 GameObject: m_ObjectHideFlags: 0 @@ -1390,6 +1463,7 @@ MonoBehaviour: type: 0 mode: 0 realtimeMode: 0 + timeSlicing: 0 lighting: multiplier: 1 weight: 1 @@ -1556,7 +1630,7 @@ MonoBehaviour: camera: camera: 0 m_ProxyVolume: {fileID: 0} - m_BakedTexture: {fileID: 8900000, guid: cb671a8506149b74284b29c9dac7d6b7, type: 3} + m_BakedTexture: {fileID: 8900000, guid: 54d3dd5df8b9495439b254eade24a6db, type: 3} m_CustomTexture: {fileID: 0} m_BakedRenderData: m_WorldToCameraRHS: @@ -1636,6 +1710,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_HasValidSHForNormalization: 0 m_SHForNormalization: sh[ 0]: 0 sh[ 1]: 0 @@ -1664,7 +1739,8 @@ MonoBehaviour: sh[24]: 0 sh[25]: 0 sh[26]: 0 - m_HasValidSHForNormalization: 0 + m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -1907,6 +1983,7 @@ MonoBehaviour: type: 1 mode: 1 realtimeMode: 0 + timeSlicing: 0 lighting: multiplier: 1 weight: 1 @@ -2153,6 +2230,7 @@ MonoBehaviour: m_CaptureRotation: {x: 0, y: 0, z: 0, w: 0} m_FieldOfView: 0 m_Aspect: 0 + m_HasValidSHForNormalization: 0 m_SHForNormalization: sh[ 0]: 0 sh[ 1]: 0 @@ -2181,7 +2259,8 @@ MonoBehaviour: sh[24]: 0 sh[25]: 0 sh[26]: 0 - m_HasValidSHForNormalization: 0 + m_SHValidForCapturePosition: {x: 0, y: 0, z: 0} + m_SHValidForSourcePosition: {x: 0, y: 0, z: 0} m_HDProbeVersion: 3 m_ObsoleteInfiniteProjection: 1 m_ObsoleteInfluenceVolume: @@ -2522,13 +2601,14 @@ MonoScript: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 5 - m_Script: + serializedVersion: 7 m_DefaultReferences: {} m_Icon: {fileID: 0} + m_Type: 2 m_ExecutionOrder: 0 m_ClassName: SceneObjectIDMapSceneAsset m_Namespace: UnityEngine.Rendering.HighDefinition + m_AssemblyName: --- !u!115 &1955490829 MonoScript: m_ObjectHideFlags: 0 @@ -2536,13 +2616,14 @@ MonoScript: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 5 - m_Script: + serializedVersion: 7 m_DefaultReferences: {} m_Icon: {fileID: 0} + m_Type: 2 m_ExecutionOrder: 0 m_ClassName: SceneObjectIDMapSceneAsset m_Namespace: UnityEngine.Rendering.HighDefinition + m_AssemblyName: --- !u!1 &1993663486 GameObject: m_ObjectHideFlags: 19 @@ -2601,10 +2682,11 @@ MonoScript: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - serializedVersion: 5 - m_Script: + serializedVersion: 7 m_DefaultReferences: {} m_Icon: {fileID: 0} + m_Type: 2 m_ExecutionOrder: 0 m_ClassName: SceneObjectIDMapSceneAsset m_Namespace: UnityEngine.Rendering.HighDefinition + m_AssemblyName: diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity.meta b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity.meta index 98c7e0499bb..863a156e470 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity.meta +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5011_VolumetricCloudsShadowsBake.unity.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 8394dceddd860454db78e045f31a5265 -labels: -- TestRunnerBake DefaultImporter: externalObjects: {} userData: diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5012_VolumetricCloudsRelativeClouds/Global Volume Profile.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5012_VolumetricCloudsRelativeClouds/Global Volume Profile.asset index 5d8567f1b72..5d1e5d2bb9a 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5012_VolumetricCloudsRelativeClouds/Global Volume Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5012_VolumetricCloudsRelativeClouds/Global Volume Profile.asset @@ -59,12 +59,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: + bottomAltitude: m_OverrideState: 1 - m_Value: 1000 - cloudThickness: + m_Value: 3000 + altitudeRange: m_OverrideState: 1 - m_Value: 6500 + m_Value: 1000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -116,8 +116,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -131,7 +131,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.05 value: 1 inSlope: 0 outSlope: 0 @@ -140,16 +140,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 - value: 0.7 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.75 value: 1 inSlope: 0 outSlope: 0 @@ -169,22 +160,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -193,8 +175,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -203,7 +185,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -213,14 +195,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -228,8 +210,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.25 + value: 0.5 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -258,32 +240,32 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0.5 densityMultiplier: - m_OverrideState: 0 - m_Value: 0.25 + m_OverrideState: 1 + m_Value: 0.4 shapeFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.95 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 0.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.8 erosionScale: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 1 m_Value: 0 @@ -313,9 +295,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 1 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 1 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 1 m_Value: 1 @@ -334,13 +325,22 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 1 m_Value: 1 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 0 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5014_VolumetricCloudsBanding/Global Volume Profile.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5014_VolumetricCloudsBanding/Global Volume Profile.asset index 600a16a12b4..6d8b9461fa1 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5014_VolumetricCloudsBanding/Global Volume Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5014_VolumetricCloudsBanding/Global Volume Profile.asset @@ -71,12 +71,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: - m_OverrideState: 0 - m_Value: 1000 - cloudThickness: + bottomAltitude: m_OverrideState: 1 - m_Value: 100 + m_Value: 1500 + altitudeRange: + m_OverrideState: 1 + m_Value: 2500 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -128,8 +128,8 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: - m_OverrideState: 0 + densityCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: @@ -143,7 +143,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.05 value: 1 inSlope: 0 outSlope: 0 @@ -152,17 +152,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.5 - value: 0.7 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 1 + time: 0.9 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -181,22 +172,13 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 value: 1 inSlope: 0 outSlope: 0 @@ -205,8 +187,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 - value: 1 + time: 0.1 + value: 0.9 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -215,7 +197,7 @@ MonoBehaviour: outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -225,20 +207,11 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - serializedVersion: 3 time: 0 value: 0 @@ -270,32 +243,32 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 0.5 densityMultiplier: - m_OverrideState: 0 - m_Value: 0.25 + m_OverrideState: 1 + m_Value: 0.3 shapeFactor: - m_OverrideState: 0 - m_Value: 0.75 + m_OverrideState: 1 + m_Value: 0.5 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 2.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.8 erosionScale: - m_OverrideState: 0 - m_Value: 50 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 0 m_Value: 0.1 @@ -325,9 +298,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 0 m_Value: 0 @@ -346,10 +328,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 1 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricCloudsProbeAndSky/Global Volume Profile.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricCloudsProbeAndSky/Global Volume Profile.asset index 5320c8a47e1..67f8f434df6 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricCloudsProbeAndSky/Global Volume Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricCloudsProbeAndSky/Global Volume Profile.asset @@ -361,12 +361,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: - m_OverrideState: 0 + bottomAltitude: + m_OverrideState: 1 m_Value: 1000 - cloudThickness: - m_OverrideState: 0 - m_Value: 8000 + altitudeRange: + m_OverrideState: 1 + m_Value: 5000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -418,7 +418,7 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: + densityCurve: m_OverrideState: 1 m_Value: serializedVersion: 2 @@ -433,7 +433,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.037 value: 1 inSlope: 0 outSlope: 0 @@ -442,16 +442,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.4758911 - value: 0.89104 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.6 value: 1 inSlope: 0 outSlope: 0 @@ -471,14 +462,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -486,8 +477,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 + time: 0.05 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -495,7 +486,16 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 + time: 0.2438 + value: 0.9498 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 value: 1 inSlope: 0 outSlope: 0 @@ -503,9 +503,18 @@ MonoBehaviour: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.93 + value: 0.9268 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -515,14 +524,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -530,8 +539,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.1 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -561,31 +570,31 @@ MonoBehaviour: m_Value: 0.5 densityMultiplier: m_OverrideState: 1 - m_Value: 0.28 + m_Value: 0.565 shapeFactor: - m_OverrideState: 0 - m_Value: 0.75 + m_OverrideState: 1 + m_Value: 0.85 shapeScale: + m_OverrideState: 1 + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 2.5 - shapeOffsetX: - m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.749 erosionScale: - m_OverrideState: 0 - m_Value: 50 + m_OverrideState: 1 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 0 m_Value: 0.1 @@ -615,9 +624,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 0 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 0 m_Value: 0 @@ -636,10 +654,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 1 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0 diff --git a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricClouds_ProbeGradient/Global Volume Profile.asset b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricClouds_ProbeGradient/Global Volume Profile.asset index 103b0fe58b7..f13886ef1ec 100644 --- a/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricClouds_ProbeGradient/Global Volume Profile.asset +++ b/Tests/SRPTests/Projects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5015_VolumetricClouds_ProbeGradient/Global Volume Profile.asset @@ -361,12 +361,12 @@ MonoBehaviour: cloudOffset: m_OverrideState: 0 m_Value: {x: 0, y: 0} - lowestCloudAltitude: - m_OverrideState: 0 + bottomAltitude: + m_OverrideState: 1 m_Value: 1000 - cloudThickness: - m_OverrideState: 0 - m_Value: 8000 + altitudeRange: + m_OverrideState: 1 + m_Value: 5000 fadeInMode: m_OverrideState: 0 m_Value: 0 @@ -393,7 +393,7 @@ MonoBehaviour: m_Value: 0 cloudPreset: m_OverrideState: 1 - m_Value: 4 + m_Value: 3 cumulusMap: m_OverrideState: 0 m_Value: {fileID: 0} @@ -418,7 +418,7 @@ MonoBehaviour: cloudMapResolution: m_OverrideState: 0 m_Value: 64 - customDensityCurve: + densityCurve: m_OverrideState: 1 m_Value: serializedVersion: 2 @@ -433,7 +433,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 + time: 0.037 value: 1 inSlope: 0 outSlope: 0 @@ -442,16 +442,7 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.4758911 - value: 0.89104 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 + time: 0.6 value: 1 inSlope: 0 outSlope: 0 @@ -471,14 +462,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customErosionCurve: - m_OverrideState: 0 + erosionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -486,8 +477,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.2 - value: 1 + time: 0.05 + value: 0.8 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -495,7 +486,16 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.8 + time: 0.2438 + value: 0.9498 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 value: 1 inSlope: 0 outSlope: 0 @@ -503,9 +503,18 @@ MonoBehaviour: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.93 + value: 0.9268 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 1 - value: 0.9 + value: 1 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -515,14 +524,14 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - customAmbientOcclusionCurve: - m_OverrideState: 0 + ambientOcclusionCurve: + m_OverrideState: 1 m_Value: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -530,8 +539,8 @@ MonoBehaviour: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0 - value: 0 + time: 0.1 + value: 0.4 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -561,31 +570,31 @@ MonoBehaviour: m_Value: 0.5 densityMultiplier: m_OverrideState: 1 - m_Value: 0.547 + m_Value: 0.35 shapeFactor: m_OverrideState: 1 - m_Value: 0.81 + m_Value: 0.85 shapeScale: m_OverrideState: 1 - m_Value: 2.5 - shapeOffsetX: + m_Value: 5 + shapeOffset: m_OverrideState: 0 - m_Value: 0 - shapeOffsetZ: - m_OverrideState: 0 - m_Value: 0 + m_Value: {x: 0, y: 0, z: 0} erosionFactor: - m_OverrideState: 0 - m_Value: 0.5 + m_OverrideState: 1 + m_Value: 0.749 erosionScale: m_OverrideState: 1 - m_Value: 50 + m_Value: 107 erosionNoiseType: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ambientLightProbeDimmer: m_OverrideState: 1 m_Value: 0.554 + sunLightDimmer: + m_OverrideState: 0 + m_Value: 1 erosionOcclusion: m_OverrideState: 0 m_Value: 0.1 @@ -615,9 +624,18 @@ MonoBehaviour: erosionSpeedMultiplier: m_OverrideState: 0 m_Value: 0.25 + verticalShapeWindSpeed: + m_OverrideState: 0 + m_Value: 0 + verticalErosionWindSpeed: + m_OverrideState: 0 + m_Value: 0 temporalAccumulationFactor: m_OverrideState: 1 m_Value: 0.95 + ghostingReduction: + m_OverrideState: 0 + m_Value: 0 shadows: m_OverrideState: 0 m_Value: 0 @@ -636,10 +654,19 @@ MonoBehaviour: shadowOpacityFallback: m_OverrideState: 0 m_Value: 0 - m_Version: 1 + m_Version: 2 m_ObsoleteWindSpeed: m_OverrideState: 0 m_Value: 1 m_ObsoleteOrientation: m_OverrideState: 0 m_Value: 0 + m_ObsoleteShapeOffsetX: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetY: + m_OverrideState: 0 + m_Value: 0 + m_ObsoleteShapeOffsetZ: + m_OverrideState: 0 + m_Value: 0