Merge pull request #820 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15528

[ATOM-15528] Exposing existing ACES parameters in tone mapping component

Gems/Atom/Feature/Common/Code/Include/Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h

@@ -60,6 +60,12 @@ namespace AZ
             : public DisplayMapperFeatureProcessorInterface
         {
         public:
+            enum OutputDeviceTransformFlags
+            {
+                AlterSurround = 0x1, // Apply gamma adjustment to compensate for dim surround
+                ApplyDesaturation = 0x2, // Apply desaturation to compensate for luminance difference
+                ApplyCATD60toD65 = 0x4, // Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point
+            };
 
             AZ_RTTI(AZ::Render::AcesDisplayMapperFeatureProcessor, "{995C2B93-8B08-4313-89B0-02394F90F1B8}", AZ::Render::DisplayMapperFeatureProcessorInterface);
 
@@ -92,12 +98,6 @@ namespace AZ
             static void ApplyLdrOdtParameters(DisplayMapperParameters* pOutParameters);
             static void ApplyHdrOdtParameters(DisplayMapperParameters* pOutParameters, const OutputDeviceTransformType& odtType);
 
-            enum OutputDeviceTransformFlags {
-                AlterSurround = 0x1,        // Apply gamma adjustment to compensate for dim surround
-                ApplyDesaturation = 0x2,    // Apply desaturation to compensate for luminance difference
-                ApplyCATD60toD65 = 0x4,     // Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point
-            };
-
             enum OutputDeviceTransformMode {
                 Srgb = 0,
                 PerceptualQuantizer,

Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/AcesOutputTransformPass.h

@@ -46,6 +46,7 @@ namespace AZ
             static RPI::Ptr<AcesOutputTransformPass> Create(const RPI::PassDescriptor& descriptor);
 
             void SetDisplayBufferFormat(RHI::Format format);
+            void SetAcesParameterOverrides(const AcesParameterOverrides& acesParameterOverrides);
 
         private:
             explicit AcesOutputTransformPass(const RPI::PassDescriptor& descriptor);
@@ -65,6 +66,8 @@ namespace AZ
             AZ::Render::DisplayMapperParameters m_displayMapperParameters = {};
 
             RHI::Format m_displayBufferFormat = RHI::Format::Unknown;
+
+            AcesParameterOverrides m_acesParameterOverrides;
         };
     }   // namespace Render
 }   // namespace AZ

Gems/Atom/Feature/Common/Code/Include/Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h

@@ -24,6 +24,48 @@ namespace AZ
 
     namespace Render
     {
+        /**
+         * The ACES display mapper parameter overrides.
+         * These parameters override default ACES parameters when m_overrideDefaults is true.
+         */
+        struct AcesParameterOverrides final
+        {
+            AZ_TYPE_INFO(AcesParameterOverrides, "{3EE8C0D4-3792-46C0-B91C-B89A81C36B91}");
+            static void Reflect(ReflectContext* context);
+
+            void LoadPreset();
+
+            // When enabled allows parameter overrides for ACES configuration
+            bool m_overrideDefaults = false;
+
+            // Apply gamma adjustment to compensate for dim surround
+            bool m_alterSurround = true;
+            // Apply desaturation to compensate for luminance difference
+            bool m_applyDesaturation = true;
+            // Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point
+            bool m_applyCATD60toD65 = true;
+            
+            // Reference white and black luminance values
+            float m_cinemaLimitsBlack = 0.02f;
+            float m_cinemaLimitsWhite = 48.0f;
+
+            // luminance linear extension below this
+            float m_minPoint = 0.0028798957f;
+            // luminance mid grey
+            float m_midPoint = 4.8f;
+            // luminance linear extension above this
+            float m_maxPoint = 1005.71912f;
+
+            // Gamma adjustment to be applied to compensate for the condition of the viewing environment.
+            // Note that ACES uses a value of 0.9811 for adjusting from dark to dim surrounding.
+            float m_surroundGamma = 0.9811f;
+            // Optional gamma value that is applied as basic gamma curve OETF
+            float m_gamma = 2.2f;
+
+            // Allows specifying default preset for different ODT modes
+            OutputDeviceTransformType m_preset = OutputDeviceTransformType_48Nits;
+        };
+
         //! A descriptor used to configure the DisplayMapper
         struct DisplayMapperConfigurationDescriptor final
         {
@@ -37,6 +79,8 @@ namespace AZ
 
             bool m_ldrGradingLutEnabled = false;
             Data::Asset<RPI::AnyAsset> m_ldrColorGradingLut;
+
+            AcesParameterOverrides m_acesParameterOverrides;
         };
 
         //! Custom pass data for DisplayMapperPass.

Gems/Atom/Feature/Common/Code/Source/DisplayMapper/AcesOutputTransformPass.cpp

@@ -102,6 +102,36 @@ namespace AZ
                     AcesDisplayMapperFeatureProcessor::GetAcesDisplayMapperParameters(&m_displayMapperParameters, OutputDeviceTransformType_48Nits);
                 }
             }
+
+            if (m_acesParameterOverrides.m_overrideDefaults)
+            {
+                m_displayMapperParameters.m_OutputDisplayTransformFlags = 0;
+                if (m_acesParameterOverrides.m_alterSurround)
+                {
+                    m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::AlterSurround;
+                }
+                if (m_acesParameterOverrides.m_applyDesaturation)
+                {
+                    m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::ApplyDesaturation;
+                }
+                if (m_acesParameterOverrides.m_applyCATD60toD65)
+                {
+                    m_displayMapperParameters.m_OutputDisplayTransformFlags |= AcesDisplayMapperFeatureProcessor::ApplyCATD60toD65;
+                }
+
+                m_displayMapperParameters.m_cinemaLimits[0] = m_acesParameterOverrides.m_cinemaLimitsBlack;
+                m_displayMapperParameters.m_cinemaLimits[1] = m_acesParameterOverrides.m_cinemaLimitsWhite;
+                m_displayMapperParameters.m_acesSplineParams.minPoint[0] = m_acesParameterOverrides.m_minPoint;
+                m_displayMapperParameters.m_acesSplineParams.midPoint[0] = m_acesParameterOverrides.m_midPoint;
+                m_displayMapperParameters.m_acesSplineParams.maxPoint[0] = m_acesParameterOverrides.m_maxPoint;
+                m_displayMapperParameters.m_surroundGamma = m_acesParameterOverrides.m_surroundGamma;
+                m_displayMapperParameters.m_gamma = m_acesParameterOverrides.m_gamma;
+            }
+        }
+
+        void AcesOutputTransformPass::SetAcesParameterOverrides(const AcesParameterOverrides& acesParameterOverrides)
+        {
+            m_acesParameterOverrides = acesParameterOverrides;
         }
     }   // namespace Render
 }   // namespace AZ

Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperConfigurationDescriptor.cpp

@@ -9,14 +9,54 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  */
 
+
 #include <AzCore/Serialization/SerializeContext.h>
 
 #include <Atom/Feature/DisplayMapper/DisplayMapperConfigurationDescriptor.h>
+#include <Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h>
 
 namespace AZ
 {
     namespace Render
     {
+        void AcesParameterOverrides::Reflect(ReflectContext* context)
+        {
+            if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
+            {
+                serializeContext->Class<AcesParameterOverrides>()
+                    ->Version(0)
+                    ->Field("OverrideDefaults", &AcesParameterOverrides::m_overrideDefaults)
+                    ->Field("AlterSurround", &AcesParameterOverrides::m_alterSurround)
+                    ->Field("ApplyDesaturation", &AcesParameterOverrides::m_applyDesaturation)
+                    ->Field("ApplyCATD60toD65", &AcesParameterOverrides::m_applyCATD60toD65)
+                    ->Field("PresetODT", &AcesParameterOverrides::m_preset)
+                    ->Field("CinemaLimitsBlack", &AcesParameterOverrides::m_cinemaLimitsBlack)
+                    ->Field("CinemaLimitsWhite", &AcesParameterOverrides::m_cinemaLimitsWhite)
+                    ->Field("MinPoint", &AcesParameterOverrides::m_minPoint)
+                    ->Field("MidPoint", &AcesParameterOverrides::m_midPoint)
+                    ->Field("MaxPoint", &AcesParameterOverrides::m_maxPoint)
+                    ->Field("SurroundGamma", &AcesParameterOverrides::m_surroundGamma)
+                    ->Field("Gamma", &AcesParameterOverrides::m_gamma);
+            }
+        }
+
+        void AcesParameterOverrides::LoadPreset()
+        {
+            DisplayMapperParameters displayMapperParameters;
+            AcesDisplayMapperFeatureProcessor::GetAcesDisplayMapperParameters(&displayMapperParameters, m_preset);
+
+            m_alterSurround = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::AlterSurround) != 0;
+            m_applyDesaturation = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::ApplyDesaturation) != 0;
+            m_applyCATD60toD65 = (displayMapperParameters.m_OutputDisplayTransformFlags & AcesDisplayMapperFeatureProcessor::ApplyCATD60toD65) != 0;
+            m_cinemaLimitsBlack = displayMapperParameters.m_cinemaLimits[0];
+            m_cinemaLimitsWhite = displayMapperParameters.m_cinemaLimits[1];
+            m_minPoint = displayMapperParameters.m_acesSplineParams.minPoint[0];
+            m_midPoint = displayMapperParameters.m_acesSplineParams.midPoint[0];
+            m_maxPoint = displayMapperParameters.m_acesSplineParams.maxPoint[0];
+            m_surroundGamma = displayMapperParameters.m_surroundGamma;
+            m_gamma = displayMapperParameters.m_gamma;
+        }
+
         void DisplayMapperConfigurationDescriptor::Reflect(AZ::ReflectContext* context)
         {
             if (auto* serializeContext = azrtti_cast<AZ::SerializeContext*>(context))

Gems/Atom/Feature/Common/Code/Source/DisplayMapper/DisplayMapperPass.cpp

@@ -106,6 +106,7 @@ namespace AZ
             {
                 if (m_acesOutputTransformPass)
                 {
+                    m_acesOutputTransformPass->SetAcesParameterOverrides(m_displayMapperConfigurationDescriptor.m_acesParameterOverrides);
                     m_acesOutputTransformPass->SetDisplayBufferFormat(m_displayBufferFormat);
                 }
                 if (m_bakeAcesOutputTransformLutPass)
@@ -509,7 +510,8 @@ namespace AZ
 
                     if (desc.m_operationType != m_displayMapperConfigurationDescriptor.m_operationType ||
                         desc.m_ldrGradingLutEnabled != m_displayMapperConfigurationDescriptor.m_ldrGradingLutEnabled ||
-                        desc.m_ldrColorGradingLut != m_displayMapperConfigurationDescriptor.m_ldrColorGradingLut)
+                        desc.m_ldrColorGradingLut != m_displayMapperConfigurationDescriptor.m_ldrColorGradingLut ||
+                        desc.m_acesParameterOverrides.m_overrideDefaults != m_displayMapperConfigurationDescriptor.m_acesParameterOverrides.m_overrideDefaults)
                     {
                         m_needToRebuildChildren = true;
                     }

Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/PostProcess/DisplayMapper/DisplayMapperComponentConfig.h

@@ -20,7 +20,6 @@ namespace AZ
 {
     namespace Render
     {
-
         class DisplayMapperComponentConfig final
             : public ComponentConfig
         {
@@ -33,6 +32,7 @@ namespace AZ
             DisplayMapperOperationType m_displayMapperOperation = DisplayMapperOperationType::Aces;
             bool m_ldrColorGradingLutEnabled = false;
             Data::Asset<RPI::AnyAsset> m_ldrColorGradingLut = {};
+            AcesParameterOverrides m_acesParameterOverrides;
         };
     }
 }

Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentConfig.cpp

@@ -20,16 +20,18 @@ namespace AZ
     {
         void DisplayMapperComponentConfig::Reflect(ReflectContext* context)
         {
+            AcesParameterOverrides::Reflect(context);
+
             if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
             {
                 serializeContext->Class<DisplayMapperComponentConfig, ComponentConfig>()
-                    ->Version(0)
+                    ->Version(1)
                     ->Field("DisplayMapperOperationType", &DisplayMapperComponentConfig::m_displayMapperOperation)
                     ->Field("LdrColorGradingLutEnabled", &DisplayMapperComponentConfig::m_ldrColorGradingLutEnabled)
                     ->Field("LdrColorGradingLut", &DisplayMapperComponentConfig::m_ldrColorGradingLut)
+                    ->Field("AcesParameterOverrides", &DisplayMapperComponentConfig::m_acesParameterOverrides)
                     ;
             }
         }
-
     } // namespace Render
 } // namespace AZ

Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/DisplayMapperComponentController.cpp

@@ -85,6 +85,7 @@ namespace AZ
             desc.m_operationType = m_configuration.m_displayMapperOperation;
             desc.m_ldrGradingLutEnabled = m_configuration.m_ldrColorGradingLutEnabled;
             desc.m_ldrColorGradingLut = m_configuration.m_ldrColorGradingLut;
+            desc.m_acesParameterOverrides = m_configuration.m_acesParameterOverrides;
             fp->RegisterDisplayMapperConfiguration(desc);
         }
 

Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/DisplayMapper/EditorDisplayMapperComponent.cpp

@@ -10,6 +10,8 @@
 *
 */
 
+#include "Atom/Feature/ACES/AcesDisplayMapperFeatureProcessor.h"
+
 #include <AzCore/RTTI/BehaviorContext.h>
 #include <PostProcess/DisplayMapper/EditorDisplayMapperComponent.h>
 
@@ -47,6 +49,76 @@ namespace AZ
                         ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                         ;
 
+                    editContext->Class<AcesParameterOverrides>(
+                        "AcesParameterOverrides", "")
+                        ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::CheckBox, &AcesParameterOverrides::m_overrideDefaults, "Override Defaults",
+                            "When enabled allows parameter overrides for ACES configuration")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::CheckBox, &AcesParameterOverrides::m_alterSurround, "Alter Surround",
+                            "Apply gamma adjustment to compensate for dim surround")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::CheckBox, &AcesParameterOverrides::m_applyDesaturation, "Alter Desaturation",
+                            "Apply desaturation to compensate for luminance difference")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::CheckBox, &AcesParameterOverrides::m_applyCATD60toD65, "Alter CAT D60 to D65",
+                            "Apply Color appearance transform (CAT) from ACES white point to assumed observer adapted white point")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        
+                        ->DataElement(
+                            Edit::UIHandlers::Default, &AcesParameterOverrides::m_cinemaLimitsBlack,
+                            "Cinema Limit (black)",
+                            "Reference black luminance value")
+                        ->DataElement(
+                            Edit::UIHandlers::Default, &AcesParameterOverrides::m_cinemaLimitsWhite,
+                            "Cinema Limit (white)",
+                            "Reference white luminance value")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+
+                        ->DataElement(
+                            Edit::UIHandlers::Vector2, &AcesParameterOverrides::m_minPoint, "Min Point (luminance)",
+                            "Linear extension below this")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        ->DataElement(
+                            Edit::UIHandlers::Vector2, &AcesParameterOverrides::m_midPoint, "Mid Point (luminance)",
+                            "Middle gray")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        ->DataElement(
+                            Edit::UIHandlers::Vector2, &AcesParameterOverrides::m_maxPoint, "Max Point (luminance)",
+                            "Linear extension above this")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::Default, &AcesParameterOverrides::m_surroundGamma, "Surround Gamma",
+                            "Gamma adjustment to be applied to compensate for the condition of the viewing environment")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+                        ->DataElement(
+                            AZ::Edit::UIHandlers::Default, &AcesParameterOverrides::m_gamma, "Gamma",
+                            "Optional gamma value that is applied as basic gamma curve OETF")
+                        ->Attribute(Edit::Attributes::ChangeNotify, Edit::PropertyRefreshLevels::ValuesOnly)
+
+                        // Load preset group
+                        ->ClassElement(AZ::Edit::ClassElements::Group, "Load Preset")
+                        ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
+                        ->DataElement(
+                            Edit::UIHandlers::ComboBox, &AcesParameterOverrides::m_preset, "Preset Selection",
+                            "Allows specifying default preset for different ODT modes")
+                        ->EnumAttribute(OutputDeviceTransformType::OutputDeviceTransformType_48Nits, "48 Nits")
+                        ->EnumAttribute(OutputDeviceTransformType::OutputDeviceTransformType_1000Nits, "1000 Nits")
+                        ->EnumAttribute(OutputDeviceTransformType::OutputDeviceTransformType_2000Nits, "2000 Nits")
+                        ->EnumAttribute(OutputDeviceTransformType::OutputDeviceTransformType_4000Nits, "4000 Nits")
+                        ->UIElement(AZ::Edit::UIHandlers::Button, "Load", "Load default preset")
+                        ->Attribute(AZ::Edit::Attributes::ChangeNotify, &AcesParameterOverrides::LoadPreset)
+                        ->Attribute(AZ::Edit::Attributes::ButtonText, "Load")
+                        ;
+
                     editContext->Class<DisplayMapperComponentConfig>("ToneMapperComponentConfig", "")
                         ->ClassElement(Edit::ClassElements::EditorData, "")
                         ->DataElement(Edit::UIHandlers::ComboBox,
@@ -64,7 +136,10 @@ namespace AZ
                             &DisplayMapperComponentConfig::m_ldrColorGradingLutEnabled,
                             "Enable LDR color grading LUT",
                             "Enable LDR color grading LUT.")
-                        ->DataElement(AZ::Edit::UIHandlers::Default, &DisplayMapperComponentConfig::m_ldrColorGradingLut, "LDR color Grading LUT", "LDR color grading LUT");
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &DisplayMapperComponentConfig::m_ldrColorGradingLut, "LDR color Grading LUT", "LDR color grading LUT")
+                        ->DataElement(AZ::Edit::UIHandlers::Default, &DisplayMapperComponentConfig::m_acesParameterOverrides, "ACES Parameters", "Parameter overrides for ACES.")
+                    ;
+
                 }
             }