Added back the ability to make aspect-ratio dependent vignettes

Author: Chman

PostProcessing/Editor/Models/VignetteModelEditor.cs

@@ -17,6 +17,7 @@ public class VignetteModelEditor : PostProcessingModelEditor
         SerializedProperty m_Roundness;
         SerializedProperty m_Mask;
         SerializedProperty m_Opacity;
+        SerializedProperty m_Rounded;
 
         public override void OnEnable()
         {
@@ -28,6 +29,7 @@ public override void OnEnable()
             m_Roundness = FindSetting((Settings x) => x.roundness);
             m_Mask = FindSetting((Settings x) => x.mask);
             m_Opacity = FindSetting((Settings x) => x.opacity);
+            m_Rounded = FindSetting((Settings x) => x.rounded);
         }
 
         public override void OnInspectorGUI()
@@ -40,9 +42,8 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(m_Center);
                 EditorGUILayout.PropertyField(m_Intensity);
                 EditorGUILayout.PropertyField(m_Smoothness);
-
-                if (m_Mode.intValue == (int)VignetteMode.Classic)
-                    EditorGUILayout.PropertyField(m_Roundness);
+                EditorGUILayout.PropertyField(m_Roundness);
+                EditorGUILayout.PropertyField(m_Rounded);
             }
             else
             {

PostProcessing/Resources/Shaders/Uber.shader

@@ -66,7 +66,7 @@ Shader "Hidden/Post FX/Uber Shader"
         // Vignette
         half3 _Vignette_Color;
         half2 _Vignette_Center; // UV space
-        half3 _Vignette_Settings; // x: intensity, y: smoothness, z: roundness
+        half4 _Vignette_Settings; // x: intensity, y: smoothness, z: roundness, w: rounded
         sampler2D _Vignette_Mask;
         half _Vignette_Opacity; // [0;1]
 
@@ -227,7 +227,7 @@ Shader "Hidden/Post FX/Uber Shader"
             #if VIGNETTE_CLASSIC
             {
                 half2 d = abs(uv - _Vignette_Center) * _Vignette_Settings.x;
-                d.x *= _ScreenParams.x / _ScreenParams.y;
+                d.x *= lerp(1.0, _ScreenParams.x / _ScreenParams.y, _Vignette_Settings.w);
                 d = pow(d, _Vignette_Settings.z); // Roundness
                 half vfactor = pow(saturate(1.0 - dot(d, d)), _Vignette_Settings.y);
                 color *= lerp(_Vignette_Color, (1.0).xxx, vfactor);

PostProcessing/Runtime/Components/VignetteComponent.cs

@@ -30,7 +30,7 @@ public override void Prepare(Material uberMaterial)
                 uberMaterial.SetVector(Uniforms._Vignette_Center, settings.center);
                 uberMaterial.EnableKeyword("VIGNETTE_CLASSIC");
                 float roundness = (1f - settings.roundness) * 6f + settings.roundness;
-                uberMaterial.SetVector(Uniforms._Vignette_Settings, new Vector3(settings.intensity * 3f, settings.smoothness * 5f, roundness));
+                uberMaterial.SetVector(Uniforms._Vignette_Settings, new Vector4(settings.intensity * 3f, settings.smoothness * 5f, roundness, settings.rounded ? 1f : 0f));
             }
             else if (settings.mode == VignetteModel.Mode.Masked)
             {

PostProcessing/Runtime/Models/VignetteModel.cs

@@ -39,6 +39,9 @@ public struct Settings
             [Range(0f, 1f), Tooltip("Mask opacity.")]
             public float opacity;
 
+            [Tooltip("Should the vignette be perfectly round or be dependent on the current aspect ratio?")]
+            public bool rounded;
+
             public static Settings defaultSettings
             {
                 get
@@ -52,7 +55,8 @@ public static Settings defaultSettings
                         smoothness = 0.2f,
                         roundness = 1f,
                         mask = null,
-                        opacity = 1f
+                        opacity = 1f,
+                        rounded = false
                     };
                 }
             }