Merge remote-tracking branch 'origin/v2' into xr_update

Author: robbiesri

PostProcessing/Editor/Effects/AmbientOcclusionEditor.cs

@@ -11,6 +11,7 @@ public sealed class AmbientOcclusionEditor : PostProcessEffectEditor<AmbientOccl
         SerializedParameterOverride m_Color;
         SerializedParameterOverride m_AmbientOnly;
         SerializedParameterOverride m_ThicknessModifier;
+        SerializedParameterOverride m_DirectLightingStrength;
         SerializedParameterOverride m_Quality;
         SerializedParameterOverride m_Radius;
 
@@ -21,23 +22,32 @@ public override void OnEnable()
             m_Color = FindParameterOverride(x => x.color);
             m_AmbientOnly = FindParameterOverride(x => x.ambientOnly);
             m_ThicknessModifier = FindParameterOverride(x => x.thicknessModifier);
+            m_DirectLightingStrength = FindParameterOverride(x => x.directLightingStrength);
             m_Quality = FindParameterOverride(x => x.quality);
             m_Radius = FindParameterOverride(x => x.radius);
         }
 
         public override void OnInspectorGUI()
         {
-            if (RuntimeUtilities.scriptableRenderPipelineActive)
+            int aoMode = m_Mode.value.intValue;
+
+            if (RuntimeUtilities.scriptableRenderPipelineActive && aoMode == (int)AmbientOcclusionMode.ScalableAmbientObscurance)
+            {
+                EditorGUILayout.HelpBox("Scalable ambient obscurance doesn't work with scriptable render pipelines.", MessageType.Warning);
+                return;
+            }
+
+#if !UNITY_2017_1_OR_NEWER
+            if (aoMode == (int)AmbientOcclusionMode.MultiScaleVolumetricObscurance)
             {
-                EditorGUILayout.HelpBox("This effect doesn't work with scriptable render pipelines yet.", MessageType.Warning);
+                EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires Unity 2017.1 or more.", MessageType.Warning);
                 return;
             }
+#endif
 
             PropertyField(m_Mode);
             PropertyField(m_Intensity);
 
-            int aoMode = m_Mode.value.intValue;
-
             if (aoMode == (int)AmbientOcclusionMode.ScalableAmbientObscurance)
             {
                 PropertyField(m_Radius);
@@ -49,8 +59,11 @@ public override void OnInspectorGUI()
                     EditorGUILayout.HelpBox("Multi-scale volumetric obscurance requires compute shader support.", MessageType.Warning);
 
                 PropertyField(m_ThicknessModifier);
+
+                if (RuntimeUtilities.scriptableRenderPipelineActive)
+                    PropertyField(m_DirectLightingStrength);
             }
-            
+
             PropertyField(m_Color);
 
             if (Camera.main != null && Camera.main.actualRenderingPath == RenderingPath.DeferredShading && Camera.main.allowHDR)

PostProcessing/Editor/Tools/CubeLutAssetImporter.cs

@@ -7,13 +7,24 @@ namespace UnityEditor.Rendering.PostProcessing
 {
     sealed class CubeLutAssetImporter : AssetPostprocessor
     {
+        static List<string> s_Excluded = new List<string>()
+        {
+            "Linear to sRGB r1",
+            "Linear to Unity Log r1",
+            "sRGB to Linear r1",
+            "sRGB to Unity Log r1",
+            "Unity Log to Linear r1",
+            "Unity Log to sRGB r1"
+        };
+
         static void OnPostprocessAllAssets(string[] imported, string[] deleted, string[] moved, string[] movedFrom)
         {
             foreach (string path in imported)
             {
                 string ext = Path.GetExtension(path);
-                
-                if (string.IsNullOrEmpty(ext))
+                string filename = Path.GetFileNameWithoutExtension(path);
+
+                if (string.IsNullOrEmpty(ext) || s_Excluded.Contains(filename))
                     continue;
 
                 ext = ext.ToLowerInvariant();

PostProcessing/Editor/Tools/ProfileFactory.cs

@@ -11,8 +11,8 @@ class ProfileFactory
         [MenuItem("Assets/Create/Post-processing Profile", priority = 201)]
         static void CreatePostProcessProfile()
         {
-            var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreatePostProcessProfile>(), "New Post-processing Profile.asset", icon, null);
+            //var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(0, ScriptableObject.CreateInstance<DoCreatePostProcessProfile>(), "New Post-processing Profile.asset", null, null);
         }
 
         internal static PostProcessProfile CreatePostProcessProfileAtPath(string path)

PostProcessing/Runtime/Effects/AmbientOcclusion.cs

@@ -28,7 +28,7 @@ public sealed class AmbientOcclusionQualityParameter : ParameterOverride<Ambient
     public sealed class AmbientOcclusion : PostProcessEffectSettings
     {
         // Shared parameters
-        [Tooltip("The ambient occlusion method to use. \"Modern\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
+        [Tooltip("The ambient occlusion method to use. \"MSVO\" is higher quality and faster on desktop & console platforms but requires compute shader support.")]
         public AmbientOcclusionModeParameter mode = new AmbientOcclusionModeParameter { value = AmbientOcclusionMode.MultiScaleVolumetricObscurance };
 
         [Range(0f, 4f), Tooltip("Degree of darkness added by ambient occlusion.")]
@@ -53,6 +53,10 @@ public sealed class AmbientOcclusion : PostProcessEffectSettings
         [Range(1f, 10f), Tooltip("Modifies thickness of occluders. This increases dark areas but also introduces dark halo around objects.")]
         public FloatParameter thicknessModifier = new FloatParameter { value = 1f };
 
+        // HDRP-only parameters
+        [Range(0f, 1f), Tooltip("")]
+        public FloatParameter directLightingStrength = new FloatParameter { value = 0f };
+
         // SAO-only parameters
         [Tooltip("Radius of sample points, which affects extent of darkened areas.")]
         public FloatParameter radius = new FloatParameter { value = 0.25f };
@@ -63,11 +67,23 @@ public sealed class AmbientOcclusion : PostProcessEffectSettings
         public override bool IsEnabledAndSupported(PostProcessRenderContext context)
         {
             bool state = enabled.value
-                && intensity.value > 0f
-                && !RuntimeUtilities.scriptableRenderPipelineActive;
+                && intensity.value > 0f;
 
-            if (mode.value == AmbientOcclusionMode.MultiScaleVolumetricObscurance)
-                state &= SystemInfo.supportsComputeShaders && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RFloat);
+            if (mode.value == AmbientOcclusionMode.ScalableAmbientObscurance)
+            {
+                state &= !RuntimeUtilities.scriptableRenderPipelineActive;
+            }
+            else if (mode.value == AmbientOcclusionMode.MultiScaleVolumetricObscurance)
+            {
+#if UNITY_2017_1_OR_NEWER
+                state &= SystemInfo.supportsComputeShaders
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RFloat)
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.RHalf)
+                      && SystemInfo.SupportsRenderTextureFormat(RenderTextureFormat.R8);
+#else
+                state = false;
+#endif
+            }
 
             return state;
         }
@@ -122,6 +138,16 @@ public override void Release()
                 m.Release();
         }
 
+        public ScalableAO GetScalableAO()
+        {
+            return (ScalableAO)m_Methods[(int)AmbientOcclusionMode.ScalableAmbientObscurance];
+        }
+
+        public MultiScaleVO GetMultiScaleVO()
+        {
+            return (MultiScaleVO)m_Methods[(int)AmbientOcclusionMode.MultiScaleVolumetricObscurance];
+        }
+
         // Unused
         public override void Render(PostProcessRenderContext context)
         {