Add VolumeComponentArchetype to handle VolumeStack specifically

com.unity.render-pipelines.core/Editor/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")]

com.unity.render-pipelines.core/Editor/Volume/VolumeComponentContext.cs

@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering
+{
+    /// <summary>
+    /// A context for volume components
+    /// </summary>
+    // Do not expose, context is a workaround to a bad UX, VolumeProfile should only accept a specific archetype
+    class VolumeComponentContext
+    {
+        // what archetype to use when displaying an Add Volume Override menu
+        [NotNull]
+        [ExcludeFromCodeCoverage] // trivial
+        public VolumeComponentArchetype contextualArchetype { get; private set; } = VolumeComponentArchetype.Empty;
+
+        HashSet<VolumeComponentArchetype> s_Includes = new HashSet<VolumeComponentArchetype>();
+        HashSet<VolumeComponentArchetype> s_Excludes = new HashSet<VolumeComponentArchetype>();
+
+        [ExcludeFromCodeCoverage] // trivial
+        public VolumeComponentContext()
+        {
+            AddExcludeArchetype(VolumeComponentArchetype.FromFilterCached(IsVisibleVolumeComponentFilter.FromIsVisible(false)));
+        }
+
+        [ExcludeFromCodeCoverage] // trivial wraps of `VolumeComponentArchetype.FromIncludeExclude`
+        public void AddIncludeArchetype([DisallowNull] VolumeComponentArchetype archetype)
+        {
+            s_Includes.Add(archetype);
+            contextualArchetype = VolumeComponentArchetype.FromIncludeExclude(s_Includes, s_Excludes);
+        }
+
+        [ExcludeFromCodeCoverage] // trivial wraps of `VolumeComponentArchetype.FromIncludeExclude`
+        public void RemoveIncludeArchetype([DisallowNull] VolumeComponentArchetype archetype)
+        {
+            s_Includes.Remove(archetype);
+            contextualArchetype = VolumeComponentArchetype.FromIncludeExclude(s_Includes, s_Excludes);
+        }
+
+        [ExcludeFromCodeCoverage] // trivial wraps of `VolumeComponentArchetype.FromIncludeExclude`
+        public void AddExcludeArchetype([DisallowNull] VolumeComponentArchetype archetype)
+        {
+            s_Excludes.Add(archetype);
+            contextualArchetype = VolumeComponentArchetype.FromIncludeExclude(s_Includes, s_Excludes);
+        }
+
+        [ExcludeFromCodeCoverage] // trivial wraps of `VolumeComponentArchetype.FromIncludeExclude`
+        public void RemoveExcludeArchetype([DisallowNull] VolumeComponentArchetype archetype)
+        {
+            s_Excludes.Remove(archetype);
+            contextualArchetype = VolumeComponentArchetype.FromIncludeExclude(s_Includes, s_Excludes);
+        }
+    }
+}

com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs

@@ -356,8 +356,9 @@ public virtual GUIContent GetDisplayTitle()
         {
             var targetType = target.GetType();
             string title = string.IsNullOrEmpty(volumeComponent.displayName) ? ObjectNames.NicifyVariableName(volumeComponent.GetType().Name) : volumeComponent.displayName;
-            string tooltip = targetType.GetCustomAttribute(typeof(VolumeComponentMenuForRenderPipeline), false) is VolumeComponentMenuForRenderPipeline supportedOn
-                ? string.Join(", ", supportedOn.pipelineTypes.Select(t => ObjectNames.NicifyVariableName(t.Name)))
+            var supportedTypes = targetType.GetCustomAttributes<SupportedOnAttribute>().Select(attr => ObjectNames.NicifyVariableName(attr.target.Name)).ToArray();
+            string tooltip = supportedTypes.Length > 0
+                ? string.Join(", ", supportedTypes)
                 : string.Empty;
             return EditorGUIUtility.TrTextContent(title, tooltip);
         }

com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs

@@ -245,7 +245,7 @@ public void OnGUI()
                     {
                         var r = hscope.rect;
                         var pos = new Vector2(r.x + r.width / 2f, r.yMax + 18f);
-                        FilterWindow.Show(pos, new VolumeComponentProvider(asset, this));
+                        FilterWindow.Show(pos, new VolumeComponentTreeProvider(asset, this, null));
                     }
                 }
             }
@@ -282,7 +282,7 @@ void OnContextClick(Vector2 position, VolumeComponentEditor targetEditor, int id
             menu.AddItem(EditorGUIUtility.TrTextContent("Collapse All"), false, () => CollapseComponents());
             menu.AddItem(EditorGUIUtility.TrTextContent("Expand All"), false, () => ExpandComponents());
             menu.AddSeparator(string.Empty);
-            menu.AddItem(EditorGUIUtility.TrTextContent("Reset"), false, () => ResetComponent(targetComponent.GetType(), id));
+            menu.AddItem(EditorGUIUtility.TrTextContent("Reset"), false, () => ResetComponent(VolumeComponentType.FromTypeUnsafe(targetComponent.GetType()), id));
             menu.AddItem(EditorGUIUtility.TrTextContent("Remove"), false, () => RemoveComponent(id));
             menu.AddSeparator(string.Empty);
             if (targetEditor.hasAdditionalProperties)
@@ -306,15 +306,15 @@ void OnContextClick(Vector2 position, VolumeComponentEditor targetEditor, int id
             menu.DropDown(new Rect(position, Vector2.zero));
         }
 
-        VolumeComponent CreateNewComponent(Type type)
+        static VolumeComponent CreateNewComponent(VolumeComponentType type)
         {
-            var effect = (VolumeComponent)ScriptableObject.CreateInstance(type);
+            var effect = (VolumeComponent)ScriptableObject.CreateInstance(type.AsType());
             effect.hideFlags = HideFlags.HideInInspector | HideFlags.HideInHierarchy;
-            effect.name = type.Name;
+            effect.name = type.AsType().Name;
             return effect;
         }
 
-        internal void AddComponent(Type type)
+        internal void AddComponent(VolumeComponentType type)
         {
             m_SerializedObject.Update();
 
@@ -388,7 +388,7 @@ internal void RemoveComponent(int id)
 
         // Reset is done by deleting and removing the object from the list and adding a new one in
         // the same spot as it was before
-        internal void ResetComponent(Type type, int id)
+        internal void ResetComponent(VolumeComponentType type, int id)
         {
             // Remove from the cached editors list
             m_Editors[id].OnDisable();

com.unity.render-pipelines.core/Editor/Volume/VolumeComponentTreeProvider.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using UnityEngine;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering
+{
+    using IProvider = FilterWindow.IProvider;
+    using Element = FilterWindow.Element;
+    using GroupElement = FilterWindow.GroupElement;
+
+    /// <summary>
+    /// Build a tree for the add volume override menu.
+    ///
+    /// Don't show a volume if it is already in the stack
+    /// </summary>
+    class VolumeComponentTreeProvider : IProvider
+    {
+        internal class VolumeComponentElement : Element
+        {
+            public VolumeComponentType type;
+
+            public VolumeComponentElement(int level, string label, VolumeComponentType type)
+            {
+                this.level = level;
+                this.type = type;
+                // TODO: Add support for custom icons
+                content = new GUIContent(label);
+            }
+        }
+
+        [ExcludeFromCodeCoverage] // trivial
+        public Vector2 position { get; set; }
+
+        VolumeProfile m_Target;
+        VolumeComponentListEditor m_TargetEditor;
+        readonly VolumeComponentArchetype m_ArchetypeOverride;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="target"></param>
+        /// <param name="targetEditor"></param>
+        /// <param name="archetypeOverride">
+        /// Use this value to override which archetype to use to create the tree.
+        /// By default it will use the <see cref="VolumeComponentUserExperience.displayedArchetype"/>
+        /// </param>
+        public VolumeComponentTreeProvider(
+            [DisallowNull] VolumeProfile target,
+            [DisallowNull] VolumeComponentListEditor targetEditor,
+            [AllowNull] VolumeComponentArchetype archetypeOverride)
+        {
+            m_Target = target;
+            m_TargetEditor = targetEditor;
+            m_ArchetypeOverride = archetypeOverride;
+        }
+
+        public void CreateComponentTree([DisallowNull] List<Element> tree)
+        {
+            tree.Add(new GroupElement(0, "Volume Overrides"));
+
+            var archetype = m_ArchetypeOverride ?? VolumeComponentUserExperience.displayedArchetype;
+            if (!archetype.GetOrAddTreeProvider(out var extension))
+                return;
+
+            // Recursively add all elements to the tree
+            Traverse(extension.root, 1, tree);
+        }
+
+        public bool GoToChild([DisallowNull] Element element, bool addIfComponent)
+        {
+            if (element is VolumeComponentElement volumeComponentElement)
+            {
+                m_TargetEditor.AddComponent(volumeComponentElement.type);
+                return true;
+            }
+
+            return false;
+        }
+
+        void Traverse(
+            [DisallowNull] VolumeComponentArchetypeTreeProvider.PathNode node,
+            int depth,
+            [DisallowNull] List<Element> tree
+        )
+        {
+            node.nodes.Sort();
+
+            foreach (var n in node.nodes)
+            {
+                if (n.nodes.Count > 0) // Group
+                {
+                    tree.Add(new GroupElement(depth, n.name));
+                    Traverse(n, depth + 1, tree);
+                }
+                else if (!m_Target.Has(n.type.AsType())) // Element
+                {
+                    tree.Add(new VolumeComponentElement(depth, n.name, n.type));
+                }
+            }
+        }
+    }
+}