Added AO color support and fixed more bugs

Author: Chman

PostProcessing/Editor/PostProcessLayerEditor.cs

@@ -31,8 +31,10 @@ public sealed class PostProcessLayerEditor : BaseEditor<PostProcessLayer>
         SerializedProperty m_SAOIntensity;
         SerializedProperty m_SAORadius;
         SerializedProperty m_SAOQuality;
+        SerializedProperty m_SAOColor;
         SerializedProperty m_MSVOIntensity;
         SerializedProperty m_MSVOThicknessModifier;
+        SerializedProperty m_MSVOColor;
         SerializedProperty m_AOAmbientOnly;
 
         SerializedProperty m_FogEnabled;
@@ -86,8 +88,10 @@ void OnEnable()
             m_SAOIntensity = FindProperty(x => x.ambientOcclusion.scalableAO.intensity);
             m_SAORadius = FindProperty(x => x.ambientOcclusion.scalableAO.radius);
             m_SAOQuality = FindProperty(x => x.ambientOcclusion.scalableAO.quality);
+            m_SAOColor = FindProperty(x => x.ambientOcclusion.scalableAO.color);
             m_MSVOIntensity = FindProperty(x => x.ambientOcclusion.multiScaleVO.intensity);
             m_MSVOThicknessModifier = FindProperty(x => x.ambientOcclusion.multiScaleVO.thicknessModifier);
+            m_MSVOColor = FindProperty(x => x.ambientOcclusion.multiScaleVO.color);
 
             m_FogEnabled = FindProperty(x => x.fog.enabled);
             m_FogExcludeSkybox = FindProperty(x => x.fog.excludeSkybox);
@@ -259,11 +263,13 @@ void DoAmbientOcclusion(Camera camera)
                         EditorGUILayout.PropertyField(m_SAOIntensity);
                         EditorGUILayout.PropertyField(m_SAORadius);
                         EditorGUILayout.PropertyField(m_SAOQuality);
+                        EditorGUILayout.PropertyField(m_SAOColor);
                     }
                     else if (aoMode == (int)AmbientOcclusion.Mode.MSVO)
                     {
                         EditorGUILayout.PropertyField(m_MSVOIntensity);
                         EditorGUILayout.PropertyField(m_MSVOThicknessModifier);
+                        EditorGUILayout.PropertyField(m_MSVOColor);
                     }
 
                     if (camera != null && camera.actualRenderingPath == RenderingPath.DeferredShading && camera.allowHDR)

PostProcessing/Runtime/Effects/MultiScaleVO.cs

@@ -22,6 +22,9 @@ public sealed class MultiScaleVO : IAmbientOcclusionMethod
         [Range(0, 2), Tooltip("Degree of darkness added by ambient occlusion.")]
         public float intensity = 1;
 
+        [ColorUsage(false), Tooltip("Custom color to use for the ambient occlusion.")]
+        public Color color = Color.black;
+
         internal enum MipLevel { Original, L1, L2, L3, L4, L5, L6 }
 
         internal enum TextureType
@@ -271,6 +274,8 @@ void RebuildCommandBuffers(PostProcessRenderContext context)
                 context.height
             );
 
+            m_PropertySheet.properties.SetVector(ShaderIDs.AOColor, Color.white - color);
+
 #if !UNITY_2017_1_OR_NEWER
              m_TiledDepth1.AllocateNow();
              m_TiledDepth2.AllocateNow();
@@ -280,9 +285,6 @@ void RebuildCommandBuffers(PostProcessRenderContext context)
 
             m_Result.AllocateNow();
 
-            // Rebuild the render commands.
-            cmd.Clear();
-
             PushDownsampleCommands(context, cmd);
 
             m_Occlusion1.PushAllocationCommand(cmd);
@@ -518,8 +520,8 @@ public void RenderAfterOpaque(PostProcessRenderContext context)
             cmd.BeginSample("Ambient Occlusion");
             DoLazyInitialization(context);
             RebuildCommandBuffers(context);
-            cmd.SetGlobalTexture(ShaderIDs.OcclusionTexture, m_Result.id);
-            cmd.Blit(null, BuiltinRenderTextureType.CameraTarget, m_PropertySheet.material, 2);
+            cmd.SetGlobalTexture(ShaderIDs.MSVOcclusionTexture, m_Result.id);
+            cmd.BlitFullscreenTriangle(context.source, context.destination, m_PropertySheet, 2);
             cmd.EndSample("Ambient Occlusion");
         }
 
@@ -537,8 +539,8 @@ public void CompositeAmbientOnly(PostProcessRenderContext context)
             var cmd = context.command;
             cmd.BeginSample("Ambient Occlusion Composite");
             cmd.SetRenderTarget(m_MRT, BuiltinRenderTextureType.CameraTarget);
-            cmd.SetGlobalTexture(ShaderIDs.OcclusionTexture, m_Result.id);
-            cmd.DrawProcedural(Matrix4x4.identity, m_PropertySheet.material, 1, MeshTopology.Triangles, 3);
+            cmd.SetGlobalTexture(ShaderIDs.MSVOcclusionTexture, m_Result.id);
+            cmd.DrawProcedural(Matrix4x4.identity, m_PropertySheet.material, 1, MeshTopology.Triangles, 3, 1, m_PropertySheet.properties);
             cmd.EndSample("Ambient Occlusion Composite");
         }
 

PostProcessing/Runtime/Effects/ScalableAO.cs

@@ -26,6 +26,9 @@ public enum Quality
         [Tooltip("Number of sample points, which affects quality and performance. Lowest, Low & Medium passes are downsampled. High and Ultra are not and should only be used on high-end hardware.")]
         public Quality quality = Quality.Medium;
 
+        [ColorUsage(false), Tooltip("Custom color to use for the ambient occlusion.")]
+        public Color color = Color.black;
+
         RenderTexture m_Result;
         PropertySheet m_PropertySheet;
 
@@ -105,6 +108,7 @@ void Render(PostProcessRenderContext context, CommandBuffer cmd, int occlusionSo
             var sheet = m_PropertySheet;
             sheet.ClearKeywords();
             sheet.properties.SetVector(ShaderIDs.AOParams, new Vector4(px, py, pz, pw));
+            sheet.properties.SetVector(ShaderIDs.AOColor, Color.white - color);
 
             // In forward fog is applied at the object level in the grometry pass so we need to
             // apply it to AO as well or it'll drawn on top of the fog effect.
@@ -160,6 +164,7 @@ public void RenderAfterOpaque(PostProcessRenderContext context)
             var cmd = context.command;
             cmd.BeginSample("Ambient Occlusion");
             Render(context, cmd, 0);
+            cmd.SetGlobalTexture(ShaderIDs.SAOcclusionTexture, m_Result);
             cmd.BlitFullscreenTriangle(context.source, context.destination, m_PropertySheet, (int)Pass.CompositionForward);
             cmd.EndSample("Ambient Occlusion");
         }
@@ -176,7 +181,7 @@ public void CompositeAmbientOnly(PostProcessRenderContext context)
         {
             var cmd = context.command;
             cmd.BeginSample("Ambient Occlusion Composite");
-            cmd.SetGlobalTexture(ShaderIDs.OcclusionTexture, m_Result);
+            cmd.SetGlobalTexture(ShaderIDs.SAOcclusionTexture, m_Result);
             cmd.BlitFullscreenTriangle(BuiltinRenderTextureType.None, m_MRT, BuiltinRenderTextureType.CameraTarget, m_PropertySheet, (int)Pass.CompositionDeferred);
             cmd.EndSample("Ambient Occlusion Composite");
         }

PostProcessing/Runtime/Utils/ShaderIDs.cs

@@ -16,9 +16,11 @@ static class ShaderIDs
         internal static readonly int SMAA_Flop                       = Shader.PropertyToID("_SMAA_Flop");
 
         internal static readonly int AOParams                        = Shader.PropertyToID("_AOParams");
+        internal static readonly int AOColor                         = Shader.PropertyToID("_AOColor");
         internal static readonly int OcclusionTexture1               = Shader.PropertyToID("_OcclusionTexture1");
         internal static readonly int OcclusionTexture2               = Shader.PropertyToID("_OcclusionTexture2");
-        internal static readonly int OcclusionTexture                = Shader.PropertyToID("_OcclusionTexture");
+        internal static readonly int SAOcclusionTexture              = Shader.PropertyToID("_SAOcclusionTexture");
+        internal static readonly int MSVOcclusionTexture             = Shader.PropertyToID("_MSVOcclusionTexture");
 
         internal static readonly int FogColor                        = Shader.PropertyToID("_FogColor");
         internal static readonly int FogParams                       = Shader.PropertyToID("_FogParams");

PostProcessing/Shaders/Builtins/MultiScaleVO.shader

@@ -4,6 +4,9 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
 
         #include "../StdLib.hlsl"
 
+        TEXTURE2D_SAMPLER2D(_MSVOcclusionTexture, sampler_MSVOcclusionTexture);
+        float3 _AOColor;
+
         // Full screen triangle with procedural draw
         // This can't be used when the destination can be the back buffer because
         // this doesn't support the situations that requires vertical flipping.
@@ -25,27 +28,6 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
             return o;
         }
 
-        // The standard vertex shader for blit, slightly modified for supporting
-        // single-pass stereo rendering.
-        struct AttributesStd
-        {
-            float4 vertex : POSITION;
-            float2 texcoord : TEXCOORD0;
-        };
-
-        VaryingsDefault VertStd(AttributesStd v)
-        {
-            VaryingsDefault o;
-            o.vertex = float4(v.vertex.xy * 2.0 - 1.0, 0.0, 1.0);
-            o.texcoord = TransformStereoScreenSpaceTex(v.texcoord, 1);
-
-            #if UNITY_UV_STARTS_AT_TOP
-            o.texcoord = o.texcoord * float2(1.0, -1.0) + float2(0.0, 1.0);
-            #endif
-
-            return o;
-        }
-
     ENDHLSL
 
     SubShader
@@ -80,7 +62,6 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
                 #pragma vertex VertProcedural
                 #pragma fragment Frag
 
-                TEXTURE2D_SAMPLER2D(_OcclusionTexture, sampler_OcclusionTexture);
 
                 struct Output
                 {
@@ -90,31 +71,33 @@ Shader "Hidden/PostProcessing/MultiScaleVO"
 
                 Output Frag(VaryingsDefault i)
                 {
-                    float ao = 1.0 - SAMPLE_TEXTURE2D(_OcclusionTexture, sampler_OcclusionTexture, i.texcoord).r;
+                    float ao = 1.0 - SAMPLE_TEXTURE2D(_MSVOcclusionTexture, sampler_MSVOcclusionTexture, i.texcoord).r;
                     Output o;
                     o.gbuffer0 = float4(0.0, 0.0, 0.0, ao);
-                    o.gbuffer3 = float4(ao, ao, ao, 0.0);
+                    o.gbuffer3 = float4(ao * _AOColor, 0.0);
                     return o;
                 }
 
             ENDHLSL
         }
 
-        // 2 - Composite to the frame buffer with the standard blit
+        // 2 - Composite to the frame buffer
         Pass
         {
-            Blend Zero SrcAlpha
-
             HLSLPROGRAM
 
-                #pragma vertex VertStd
+                #pragma vertex VertDefault
                 #pragma fragment Frag
 
-                TEXTURE2D_SAMPLER2D(_OcclusionTexture, sampler_OcclusionTexture);
+                TEXTURE2D_SAMPLER2D(_MainTex, sampler_MainTex);
 
                 float4 Frag(VaryingsDefault i) : SV_Target
                 {
-                    return SAMPLE_TEXTURE2D(_OcclusionTexture, sampler_OcclusionTexture, i.texcoord).rrrr;
+                    float2 texcoord = TransformStereoScreenSpaceTex(i.texcoord, 1);
+                    half ao = 1.0 - SAMPLE_TEXTURE2D(_MSVOcclusionTexture, sampler_MSVOcclusionTexture, texcoord).r;
+                    half4 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, texcoord);
+                    color.rgb *= 1.0 - ao * _AOColor;
+                    return color;
                 }
 
             ENDHLSL

PostProcessing/Shaders/Builtins/ScalableAO.hlsl

@@ -53,6 +53,7 @@ TEXTURE2D_SAMPLER2D(_CameraDepthNormalsTexture, sampler_CameraDepthNormalsTextur
 float4 _MainTex_TexelSize;
 
 float4 _AOParams;
+float3 _AOColor;
 
 // Sample count
 #if !defined(SHADER_API_GLES)
@@ -63,8 +64,8 @@ float4 _AOParams;
 #endif
 
 // Source texture properties
-TEXTURE2D_SAMPLER2D(_OcclusionTexture, sampler_OcclusionTexture);
-float4 _OcclusionTexture_TexelSize;
+TEXTURE2D_SAMPLER2D(_SAOcclusionTexture, sampler_SAOcclusionTexture);
+float4 _SAOcclusionTexture_TexelSize;
 
 // Other parameters
 #define INTENSITY _AOParams.x
@@ -383,9 +384,9 @@ half BlurSmall(TEXTURE2D_ARGS(tex, samp), float2 uv, float2 delta)
 float4 FragComposition(VaryingsDefault i) : SV_Target
 {
     float2 delta = _MainTex_TexelSize.xy / DOWNSAMPLE;
-    half ao = BlurSmall(TEXTURE2D_PARAM(_OcclusionTexture, sampler_OcclusionTexture), i.texcoord, delta);
+    half ao = BlurSmall(TEXTURE2D_PARAM(_SAOcclusionTexture, sampler_SAOcclusionTexture), i.texcoord, delta);
     half4 color = SAMPLE_TEXTURE2D(_MainTex, sampler_MainTex, UnityStereoTransformScreenSpaceTex(i.texcoord));
-    color.rgb *= 1.0 - EncodeAO(ao);
+    color.rgb *= 1.0 - EncodeAO(ao) * _AOColor;
     return color;
 }
 
@@ -399,14 +400,14 @@ struct CompositionOutput
 
 CompositionOutput FragCompositionGBuffer(VaryingsDefault i)
 {
-    // Workaround: _OcclusionTexture_Texelsize hasn't been set properly
+    // Workaround: _SAOcclusionTexture_Texelsize hasn't been set properly
     // for some reasons. Use _ScreenParams instead.
     float2 delta = (_ScreenParams.zw - 1.0) / DOWNSAMPLE;
-    half ao = BlurSmall(TEXTURE2D_PARAM(_OcclusionTexture, sampler_OcclusionTexture), i.texcoord, delta);
+    half ao = BlurSmall(TEXTURE2D_PARAM(_SAOcclusionTexture, sampler_SAOcclusionTexture), i.texcoord, delta);
 
     CompositionOutput o;
     o.gbuffer0 = half4(0.0, 0.0, 0.0, ao);
-    o.gbuffer3 = half4((half3)EncodeAO(ao), 0.0);
+    o.gbuffer3 = half4((half3)EncodeAO(ao) * _AOColor, 0.0);
     return o;
 }