Testing Scene hi-cut filter, not in materials. (#27)

Co-authored-by: higeometry <[email protected]>

Author: H3idi-X

com.unity.toonshader/Editor/ToonEvAdjustmentCurveInspector.cs

@@ -17,7 +17,7 @@ public override void OnInspectorGUI()
         {
             const string labelLightAdjustment = "Toon EV Adjustment";
             const string labelLightAdjustmentCurve = "Curve";
-
+            const string labelLightHighCutFilter = "Light High-Cult Filter";
 #if ADJUSTMENT_CURVE_DEBUG_UI
             const string labelExposureMin = "Min:";
             const string labelExposureMax = "Max:";
@@ -60,17 +60,17 @@ public override void OnInspectorGUI()
             EditorGUI.EndDisabledGroup();
 
             //Rect rect = GUILayoutUtility.GetRect(Screen.width, 300.0f);
-#if false
+
             EditorGUI.BeginChangeCheck();
 
-            bool lightAdjustment = EditorGUILayout.Toggle(labelLightAdjustment, obj.m_LightAdjustment);
+            bool lightFilterr = EditorGUILayout.Toggle(labelLightHighCutFilter, obj.m_ToonLightHiCutFilter);
             if (EditorGUI.EndChangeCheck())
             {
-                Undo.RecordObject(target, "Changed Light Adjustment");
-                obj.m_LightAdjustment = lightAdjustment;
+                Undo.RecordObject(target, "Changed Light Hi Cut Filter");
+                obj.m_ToonLightHiCutFilter = lightFilterr;
                 isChanged = true;
             }
-#endif
+
 
             if ( isChanged)
             {

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

@@ -75,7 +75,7 @@ float3 UTS_MainLight(LightLoopContext lightLoopContext, FragInputs input, int ma
     float3 originalLightColor = mainLightColor;
 
     originalLightColor = lerp(originalLightColor, clamp(originalLightColor, ConvertFromEV100(_ToonEvAdjustmentValueMin ), ConvertFromEV100(_ToonEvAdjustmentValueMax)), _ToonEvAdjustmentCurve);
-    float3 lightColor = lerp(max(defaultLightColor, originalLightColor), max(defaultLightColor, saturate(originalLightColor)), _Is_Filter_LightColor );
+    float3 lightColor = lerp(max(defaultLightColor, originalLightColor), max(defaultLightColor, saturate(originalLightColor)), max(_Is_Filter_LightColor, _ToonLightHiCutFilter));
 
 
     ////// Lighting:

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

@@ -85,7 +85,7 @@ float3 UTS_MainLightShadingGrademap(LightLoopContext lightLoopContext, FragInput
     float3 originalLightColor = mainLightColor.rgb;
 
     originalLightColor = lerp(originalLightColor, clamp(originalLightColor, ConvertFromEV100(_ToonEvAdjustmentValueMin ), ConvertFromEV100(_ToonEvAdjustmentValueMax)), _ToonEvAdjustmentCurve);
-    float3 lightColor = lerp(max(defaultLightColor, originalLightColor), max(defaultLightColor, saturate(originalLightColor)), _Is_Filter_LightColor );
+    float3 lightColor = lerp(max(defaultLightColor, originalLightColor), max(defaultLightColor, saturate(originalLightColor)), max(_Is_Filter_LightColor, _ToonLightHiCutFilter));
 
 
     ////// Lighting:

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

@@ -23,6 +23,7 @@ int eOutline = 6;
 
 
 // not in materials
+uniform int _ToonLightHiCutFilter;
 uniform int _ToonEvAdjustmentCurve;
 uniform float _ToonEvAdjustmentValueArray[128];
 uniform float _ToonEvAdjustmentValueMin;

com.unity.toonshader/Runtime/ToonEvAdjustmentCurve.cs

@@ -24,9 +24,10 @@ public class ToonEvAdjustmentCurve : MonoBehaviour
         const string kExposureArrayPropName = "_ToonEvAdjustmentValueArray";
         const string kExposureMinPropName   = "_ToonEvAdjustmentValueMin";
         const string kExposureMaxPropName   = "_ToonEvAdjustmentValueMax";
+        const string kToonLightFilterPropName = "_ToonLightHiCutFilter";
 
-
-
+        [SerializeField]
+        internal bool m_ToonLightHiCutFilter= false;
 
         [SerializeField]
         internal bool m_ExposureAdjustmnt = false;
@@ -105,7 +106,7 @@ void Update()
             Shader.SetGlobalFloat(kExposureMinPropName, m_Min);
             Shader.SetGlobalFloat(kExposureMaxPropName, m_Max);
             Shader.SetGlobalInt(kExposureAdjustmentPorpName, m_ExposureAdjustmnt ? 1 : 0);
-
+            Shader.SetGlobalInt(kToonLightFilterPropName, m_ToonLightHiCutFilter ? 1 : 0);
 
 
         }
@@ -155,7 +156,7 @@ void Initialize()
                 return;
 #endif
 
-            if (m_ExposureArray == null)
+            if (m_ExposureArray == null || m_ExposureArray.Length != kAdjustmentCurvePrecision )
             {
                 m_ExposureArray = new float[kAdjustmentCurvePrecision];
             }
@@ -168,8 +169,9 @@ void Release()
             if (m_initialized)
             {
                 m_ExposureArray = null;
-                Shader.SetGlobalInt(kExposureAdjustmentPorpName, 0);
-            }
+                Shader.SetGlobalInt(kExposureAdjustmentPorpName, 0);
+                Shader.SetGlobalInt(kToonLightFilterPropName, 0);
+            }
 
             m_initialized = false;