Feature/task 820 hdrp compensation (#84)

* Added UI in CS files and params in the shaders to deal with Compensation. [skip ci]

* removed duplicate multi_compile pragma in HDRPToon.shader. [skip ci]

* Compensation started to work.

* Fixed: GetExposureAdjustedColor()

* Enabled _ToonEvAdjustmentCompensation.

* The effect of exposure compensation was made to be similar to that of HDRP.

* Updated CHANGELOG.md.

Author: H3idi-X

com.unity.toonshader/CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 ## [0.4.1-preview] - 2021-10-27
+### Added
+* Something similar to exposure compensation.
 ### Fixed:
 * typo in documants.
+* missing mono behaviors in sample scenes.
+
 ## [0.4.0-preview] - 2021-10-13
 ### Added
 * HDRP: Compatibility with Box Light, a spot light varietion, as main lights.

com.unity.toonshader/Editor/ModelToonEvAdjustmentInspector.cs

@@ -13,11 +13,12 @@ public class ModelToonEvAdjustmentInspector : Editor
 
         public override void OnInspectorGUI()
         {
+
             const string labelLightAdjustment = "Toon EV Adjustment";
             const string labelLightAdjustmentCurve = "Curve";
             const string labelLightHighCutFilter = "Light High-Cut Filter";
             const string labeIgnoreVolumeExposure = "Ignore Volume Exposure";
-
+            const string labelCompensation = "Compensation";
 
             bool isChanged = false;
 
@@ -46,6 +47,17 @@ public override void OnInspectorGUI()
             }
 
 
+            // Compensation
+            EditorGUILayout.BeginHorizontal();
+            EditorGUI.BeginChangeCheck();
+            float compensation = EditorGUILayout.FloatField(labelCompensation, obj.m_Compensation);
+            if (EditorGUI.EndChangeCheck())
+            {
+                Undo.RecordObject(target, "Changed Compensation");
+                obj.m_Compensation = compensation;
+                isChanged = true;
+            }
+            EditorGUILayout.EndHorizontal();
 
 
             // curve
@@ -57,7 +69,7 @@ public override void OnInspectorGUI()
                 obj.m_ExposureAdjustmnt = exposureAdjustment;
                 isChanged = true;
             }
-            // = obj.m_AnimationCurve;            // curve
+
 
 
 

com.unity.toonshader/Editor/SceneToonEvAdjustmentInspector.cs

@@ -15,11 +15,12 @@ public class ToonEvAdjustmentCurveCurveInspector : Editor
 #endif //
         public override void OnInspectorGUI()
         {
+
             const string labelLightAdjustment = "Toon EV Adjustment";
             const string labelLightAdjustmentCurve = "Curve";
             const string labelLightHighCutFilter = "Light High-Cut Filter";
             const string labeIgnoreVolumeExposure = "Ignore Volume Exposure";
-
+            const string labelCompensation = "Compensation";
 #if ADJUSTMENT_CURVE_DEBUG_UI
             const string labelExposureMin = "Min:";
             const string labelExposureMax = "Max:";
@@ -52,6 +53,17 @@ public override void OnInspectorGUI()
 
 
 
+            // Compensation
+            EditorGUILayout.BeginHorizontal();
+            EditorGUI.BeginChangeCheck();
+            float compensation = EditorGUILayout.FloatField(labelCompensation, obj.m_Compensation);
+            if (EditorGUI.EndChangeCheck())
+            {
+                Undo.RecordObject(target, "Changed Compensation");
+                obj.m_Compensation = compensation;
+                isChanged = true;
+            }
+            EditorGUILayout.EndHorizontal();
 
             // curve
             EditorGUI.BeginChangeCheck();
@@ -62,7 +74,6 @@ public override void OnInspectorGUI()
                 obj.m_ExposureAdjustmnt = exposureAdjustment;
                 isChanged = true;
             }
-            // = obj.m_AnimationCurve;            // curve
 
 
 

com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader

@@ -1066,7 +1066,7 @@ Shader "HDRP/Toon"
             #pragma multi_compile _IS_OUTLINE_CLIPPING_NO _IS_OUTLINE_CLIPPING_YES
             #pragma multi_compile _OUTLINE_NML _OUTLINE_POS
             #pragma shader_feature _ _IS_CLIPPING_MATTE
-            #pragma multi_compile _ UTS_DEBUG_SHADOWMAP_NO_OUTLINE
+
             #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Material/Material.hlsl"
             #include "Packages/com.unity.render-pipelines.high-definition/Runtime/Lighting/Lighting.hlsl"
 

com.unity.toonshader/Runtime/HDRP/Shaders/ShaderPassForwardUTS.hlsl

@@ -497,7 +497,9 @@ void Frag(PackedVaryingsToPS packedInput,
     float3 envLightColor = envColor;
     float3 envLightIntensity = GetLightAttenuation(envLightColor)  < 1 ? GetLightAttenuation(envLightColor) : 1;
     float3 finalColorWoEmissive = SATURATE_IF_SDR(finalColor) + (envLightColor * envLightIntensity * _GI_Intensity * smoothstep(1, 0, envLightIntensity / 2));
+
     finalColorWoEmissive = GetExposureAdjustedColor(finalColorWoEmissive );
+    finalColorWoEmissive = ApplyCompensation(finalColorWoEmissive);
     finalColor = finalColorWoEmissive + emissive;
 
 

com.unity.toonshader/Runtime/HDRP/Shaders/UtsLightLoop.hlsl

@@ -30,6 +30,7 @@ int _ToonEvAdjustmentCurve;
 float _ToonEvAdjustmentValueArray[128];
 float _ToonEvAdjustmentValueMin;
 float _ToonEvAdjustmentValueMax;
+float _ToonEvAdjustmentCompensation;
 float _ToonIgnoreExposureMultiplier;
 
 
@@ -73,11 +74,21 @@ float WeightSample(PositionInputs positionInput)
     return 1.0 - saturate(weight);
 }
 
+float3 ApplyCompensation(float3 originalColor)
+{
+    float3 ev100_Color = ConvertToEV100(originalColor) +_ToonEvAdjustmentCompensation * 0.5f; 
+
+
+    float3 resultColor = max(0, ConvertFromEV100(ev100_Color));
+    return resultColor;
+}
+
 float3 ApplyCurrentExposureMultiplier(float3 color)
 {
-    return color * lerp(GetCurrentExposureMultiplier(),1, _ToonIgnoreExposureMultiplier);
+    return color * lerp(GetCurrentExposureMultiplier(), 1, _ToonIgnoreExposureMultiplier);
 }
 
+
 float3 GetExposureAdjustedColor(float3 originalColor)
 {
     if (_ToonEvAdjustmentCurve != 0)

com.unity.toonshader/Runtime/HDRP/Shaders/UtsUnityPerMaterial.hlsl

@@ -182,6 +182,7 @@ int _ToonEvAdjustmentCurve;
 float _ToonEvAdjustmentValueArray[128];
 float _ToonEvAdjustmentValueMin;
 float _ToonEvAdjustmentValueMax;
+float _ToonEvAdjustmentCompensation;
 #endif //#if !defined(_UTS_TOON_EV_PER_MODEL)
 
 

com.unity.toonshader/Runtime/ModelToonEvAdjustment.cs

@@ -15,7 +15,8 @@ namespace Unity.Rendering.Toon
     [DisallowMultipleComponent]
     public class ModelToonEvAdjustment : MonoBehaviour
     {
-        const string kExposureAdjustmentPorpName = "_ToonEvAdjustmentCurve";
+        const string kCompensationPorpName = "_ToonEvAdjustmentCompensation";
+        const string kExposureAdjustmentPropName = "_ToonEvAdjustmentCurve";
         const string kExposureArrayPropName = "_ToonEvAdjustmentValueArray";
         const string kExposureMinPropName = "_ToonEvAdjustmentValueMin";
         const string kExposureMaxPropName = "_ToonEvAdjustmentValueMax";
@@ -42,6 +43,8 @@ public class ModelToonEvAdjustment : MonoBehaviour
         internal float[] m_ExposureArray;
         [SerializeField]
         internal float m_Max, m_Min;
+        [SerializeField]
+        internal float m_Compensation;
 
         internal GameObject[] m_Objs;
         [SerializeField]
@@ -142,13 +145,12 @@ void Update()
             {
                 m_Renderers[ii].GetPropertyBlock(m_MaterialPropertyBlocks[ii]);
 
-//                materialPropertyBlocks[ii].SetColor("_UnlitColor", col);
                 m_MaterialPropertyBlocks[ii].SetFloatArray(kExposureArrayPropName, m_ExposureArray);
                 m_MaterialPropertyBlocks[ii].SetFloat(kExposureMinPropName, m_Min);
                 m_MaterialPropertyBlocks[ii].SetFloat(kExposureMaxPropName, m_Max);
-                m_MaterialPropertyBlocks[ii].SetInt(kExposureAdjustmentPorpName, m_ExposureAdjustmnt ? 1 : 0);
+                m_MaterialPropertyBlocks[ii].SetInt(kExposureAdjustmentPropName, m_ExposureAdjustmnt ? 1 : 0);
                 m_MaterialPropertyBlocks[ii].SetInt(kToonLightFilterPropName, m_ToonLightHiCutFilter ? 1 : 0);
-
+                m_MaterialPropertyBlocks[ii].SetFloat(kCompensationPorpName, m_Compensation);
 
                 m_Renderers[ii].SetPropertyBlock(m_MaterialPropertyBlocks[ii]);
             }

com.unity.toonshader/Runtime/SceneToonEvAdjustment.cs

@@ -19,8 +19,8 @@ public class SceneToonEvAdjustment : MonoBehaviour
 
         const int kAdjustmentCurvePrecision = 128;
 
-  
-        const string kExposureAdjustmentPorpName = "_ToonEvAdjustmentCurve";
+        const string kCompensationPorpName = "_ToonEvAdjustmentCompensation";
+        const string kExposureAdjustmentPropName = "_ToonEvAdjustmentCurve";
         const string kExposureArrayPropName = "_ToonEvAdjustmentValueArray";
         const string kExposureMinPropName   = "_ToonEvAdjustmentValueMin";
         const string kExposureMaxPropName   = "_ToonEvAdjustmentValueMax";
@@ -40,7 +40,8 @@ public class SceneToonEvAdjustment : MonoBehaviour
         [SerializeField]
         internal float m_Max, m_Min;
         [SerializeField]
-        internal bool m_DebugUI;
+        internal float m_Compensation;
+
 
         private static SceneToonEvAdjustment instance;
 #if UNITY_EDITOR
@@ -128,10 +129,10 @@ void Update()
             Shader.SetGlobalFloatArray(kExposureArrayPropName, m_ExposureArray);
             Shader.SetGlobalFloat(kExposureMinPropName, m_Min);
             Shader.SetGlobalFloat(kExposureMaxPropName, m_Max);
-            Shader.SetGlobalInt(kExposureAdjustmentPorpName, m_ExposureAdjustmnt ? 1 : 0);
+            Shader.SetGlobalInt(kExposureAdjustmentPropName, m_ExposureAdjustmnt ? 1 : 0);
             Shader.SetGlobalInt(kToonLightFilterPropName, m_ToonLightHiCutFilter ? 1 : 0);
             Shader.SetGlobalInt(kIgonoreVolumeExposurePropName, m_IgnorVolumeExposure ? 1: 0);
-
+            Shader.SetGlobalFloat(kCompensationPorpName, m_Compensation);
         }
 
         void EnableSrpCallbacks()
@@ -192,7 +193,7 @@ void Release()
             if (m_initialized)
             {
                 m_ExposureArray = null;
-                Shader.SetGlobalInt(kExposureAdjustmentPorpName, 0);
+                Shader.SetGlobalInt(kExposureAdjustmentPropName, 0);
                 Shader.SetGlobalInt(kToonLightFilterPropName, 0);
             }