From 349e7595e561ef9791051eb05550869c8e9903a4 Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Wed, 15 Jul 2020 14:56:28 +0200 Subject: [PATCH 1/2] Make sure serialization of exposure modes is consistent between HDRP versions --- .../CHANGELOG.md | 1 + .../Runtime/PostProcessing/Components/Exposure.cs | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/CHANGELOG.md b/com.unity.render-pipelines.high-definition/CHANGELOG.md index f65a221d12d..acb77844c96 100644 --- a/com.unity.render-pipelines.high-definition/CHANGELOG.md +++ b/com.unity.render-pipelines.high-definition/CHANGELOG.md @@ -731,6 +731,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed path-traced subsurface scattering mixing with diffuse and specular BRDFs (1250601). - Fixed custom pass re-ordering issues. - Improved robustness of normal mapping when scale is 0, and mapping is extreme (normals in or below the tangent plane). +- Fixed issue with serialization of exposure modes in volume profiles not being consistent between HDRP versions (case 1261385). ### Changed - Improve MIP selection for decals on Transparents diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs index 1cdd5edd4f8..5a8507fa826 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs @@ -183,11 +183,6 @@ public enum ExposureMode /// Automatic, - /// - /// Automatically sets the exposure depending on what is on screen and can filter out outliers based on provided settings. - /// - AutomaticHistogram, - /// /// Maps the current Scene exposure to a custom curve. /// @@ -196,7 +191,12 @@ public enum ExposureMode /// /// Uses the current physical Camera settings to set the Scene exposure. /// - UsePhysicalCamera + UsePhysicalCamera, + + /// + /// Automatically sets the exposure depending on what is on screen and can filter out outliers based on provided settings. + /// + AutomaticHistogram } /// From 83a0a06571cd1a5b32888f6737aad849d6df228e Mon Sep 17 00:00:00 2001 From: Pavlos Mavridis Date: Thu, 16 Jul 2020 14:45:02 +0200 Subject: [PATCH 2/2] Fix visual ordering + defaults for new scenes --- .../Outdoors/Sky and Fog Settings Profile.asset | 2 +- .../Sky and Fog Settings Profile.asset | 2 +- .../PostProcessing/Components/Exposure.cs | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/Sky and Fog Settings Profile.asset b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/Sky and Fog Settings Profile.asset index 159acab728e..734282b2588 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/Sky and Fog Settings Profile.asset +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/Outdoors/Sky and Fog Settings Profile.asset @@ -332,7 +332,7 @@ MonoBehaviour: m_AdvancedMode: 0 mode: m_OverrideState: 1 - m_Value: 2 + m_Value: 4 meteringMode: m_OverrideState: 0 m_Value: 2 diff --git a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/Sky and Fog Settings Profile.asset b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/Sky and Fog Settings Profile.asset index 159acab728e..734282b2588 100644 --- a/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/Sky and Fog Settings Profile.asset +++ b/com.unity.render-pipelines.high-definition/Editor/SceneTemplates/OutdoorsDXR/Sky and Fog Settings Profile.asset @@ -332,7 +332,7 @@ MonoBehaviour: m_AdvancedMode: 0 mode: m_OverrideState: 1 - m_Value: 2 + m_Value: 4 meteringMode: m_OverrideState: 0 m_Value: 2 diff --git a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs index 5a8507fa826..c45ada2957f 100644 --- a/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs +++ b/com.unity.render-pipelines.high-definition/Runtime/PostProcessing/Components/Exposure.cs @@ -176,27 +176,27 @@ public enum ExposureMode /// /// Allows you to manually sets the Scene exposure. /// - Fixed, + Fixed = 0, /// /// Automatically sets the exposure depending on what is on screen. /// - Automatic, + Automatic = 1, /// - /// Maps the current Scene exposure to a custom curve. + /// Automatically sets the exposure depending on what is on screen and can filter out outliers based on provided settings. /// - CurveMapping, + AutomaticHistogram = 4, /// - /// Uses the current physical Camera settings to set the Scene exposure. + /// Maps the current Scene exposure to a custom curve. /// - UsePhysicalCamera, + CurveMapping = 2, /// - /// Automatically sets the exposure depending on what is on screen and can filter out outliers based on provided settings. + /// Uses the current physical Camera settings to set the Scene exposure. /// - AutomaticHistogram + UsePhysicalCamera = 3 } ///