Merge pull request #923 from Unity-Technologies/fix/RemoveAnimationFoldouts

[UI] Removed animation on foldouts
7 年前 · 249256e5
--- a/ScriptableRenderPipeline/Core/CoreRP/Editor/CoreEditorDrawers.cs
+++ b/ScriptableRenderPipeline/Core/CoreRP/Editor/CoreEditorDrawers.cs
+using System;
 using System.Collections.Generic;
 using UnityEditor.AnimatedValues;
 using UnityEngine;
+    [Flags]
+    public enum FoldoutOption
+    {
+        None = 0,
+        Indent = 1 << 0,
+        Animate = 1 << 1
+    }
+
+    [Flags]
+    public enum FadeOption
+    {
+        None = 0,
+        Indent = 1 << 0,
+        Animate = 1 << 1
+    }
+
    public static class CoreEditorDrawer<TUIState, TData>
    {
        public interface IDrawer
            return new ActionDrawerInternal(drawers);
        }

-        public static IDrawer FadeGroup(AnimBoolItemGetter fadeGetter, bool indent, params IDrawer[] groupDrawers)
+        public static IDrawer FadeGroup(AnimBoolItemGetter fadeGetter, FadeOption options, params IDrawer[] groupDrawers)
-            return new FadeGroupsDrawerInternal(fadeGetter, indent, groupDrawers);
+            return new FadeGroupsDrawerInternal(fadeGetter, options, groupDrawers);
-        public static IDrawer FoldoutGroup(string title, AnimBoolGetter root, bool indent, params IDrawer[] bodies)
+        public static IDrawer FoldoutGroup(string title, AnimBoolGetter root, FoldoutOption options, params IDrawer[] bodies)
-            return new FoldoutDrawerInternal(title, root, indent, bodies);
+            return new FoldoutDrawerInternal(title, root, options, bodies);
        }

        public static IDrawer Select<T2UIState, T2Data>(

        class FadeGroupsDrawerInternal : IDrawer
        {
-            IDrawer[] groupDrawers;
-            AnimBoolItemGetter getter;
-            bool indent;
+            IDrawer[] m_GroupDrawers;
+            AnimBoolItemGetter m_Getter;
+            FadeOption m_Options;
-            public FadeGroupsDrawerInternal(AnimBoolItemGetter getter, bool indent, params IDrawer[] groupDrawers)
+            bool indent { get { return (m_Options & FadeOption.Indent) != 0; } }
+            bool animate { get { return (m_Options & FadeOption.Animate) != 0; } }
+
+            public FadeGroupsDrawerInternal(AnimBoolItemGetter getter, FadeOption options, params IDrawer[] groupDrawers)
-                this.groupDrawers = groupDrawers;
-                this.getter = getter;
-                this.indent = indent;
+                m_GroupDrawers = groupDrawers;
+                m_Getter = getter;
+                m_Options = options;
            }

            void IDrawer.Draw(TUIState s, TData p, Editor owner)
                GUILayout.BeginVertical();
-                for (var i = 0; i < groupDrawers.Length; ++i)
+                for (var i = 0; i < m_GroupDrawers.Length; ++i)
-                    var b = getter(s, p, owner, i);
-                    if (EditorGUILayout.BeginFadeGroup(b.faded))
+                    var b = m_Getter(s, p, owner, i);
+                    if (animate && EditorGUILayout.BeginFadeGroup(b.faded)
+                        || !animate && b.target)
-                        groupDrawers[i].Draw(s, p, owner);
+                        m_GroupDrawers[i].Draw(s, p, owner);
-                    EditorGUILayout.EndFadeGroup();
+                    if (animate)
+                        EditorGUILayout.EndFadeGroup();
                }
                GUILayout.EndVertical();
            }
        {
-            IDrawer[] bodies;
-            AnimBoolGetter isExpanded;
-            string title;
-            bool indent;
+            IDrawer[] m_Bodies;
+            AnimBoolGetter m_IsExpanded;
+            string m_Title;
+            FoldoutOption m_Options;
+            bool m_Animate;
+
+            bool animate { get { return (m_Options & FoldoutOption.Animate) != 0; } }
+            bool indent { get { return (m_Options & FoldoutOption.Indent) != 0; } }
-            public FoldoutDrawerInternal(string title, AnimBoolGetter isExpanded, bool indent, params IDrawer[] bodies)
+            public FoldoutDrawerInternal(string title, AnimBoolGetter isExpanded, FoldoutOption options, params IDrawer[] bodies)
-                this.title = title;
-                this.isExpanded = isExpanded;
-                this.bodies = bodies;
-                this.indent = indent;
+                m_Title = title;
+                m_IsExpanded = isExpanded;
+                m_Bodies = bodies;
+                m_Options = options;
-                var r = isExpanded(s, p, owner);
+                var r = m_IsExpanded(s, p, owner);
-                r.target = CoreEditorUtils.DrawHeaderFoldout(title, r.target);
+                r.target = CoreEditorUtils.DrawHeaderFoldout(m_Title, r.target);
-                if (EditorGUILayout.BeginFadeGroup(r.faded))
+                if (animate && EditorGUILayout.BeginFadeGroup(r.faded)
+                    || !animate && r.target)
-                    for (var i = 0; i < bodies.Length; i++)
-                        bodies[i].Draw(s, p, owner);
+                    for (var i = 0; i < m_Bodies.Length; i++)
+                        m_Bodies[i].Draw(s, p, owner);
-                EditorGUILayout.EndFadeGroup();
+                if (animate)
+                    EditorGUILayout.EndFadeGroup();
                GUILayout.EndVertical();
            }
        }
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Camera/HDCameraUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Camera/HDCameraUI.cs
        public static readonly CED.IDrawer SectionCaptureSettings = CED.FoldoutGroup(
            "Capture Settings",
            (s, p, o) => s.isSectionExpandedCaptureSettings,
-            true,
+            FoldoutOption.Indent,
            CED.Action(Drawer_FieldOcclusionCulling),
            CED.Action(Drawer_FieldNormalizedViewPort));

-            true,
+            FoldoutOption.Indent,
 #if ENABLE_MULTIPLE_DISPLAYS
            CED.Action(Drawer_SectionMultiDisplay),
 #endif
        public static readonly CED.IDrawer SectionXRSettings = CED.FadeGroup(
            (s, d, o, i) => s.isSectionAvailableXRSettings,
-            false,
+            FadeOption.Animate,
-                true,
+                FoldoutOption.Indent,
-            false,
+            FadeOption.Animate,
            CED.Select(
                (s, d, o) => s.frameSettingsUI,
                (s, d, o) => d.frameSettings,
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/HDReflectionProbeUI.Drawers.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/HDReflectionProbeUI.Drawers.cs
        
            CED.Action(Drawer_ReflectionProbeMode),
            CED.FadeGroup((s, p, o, i) => s.IsSectionExpandedMode((ReflectionProbeMode)i),
-                true,
+                FadeOption.Indent | FadeOption.Animate,
                CED.noop,                                      // Baked
                CED.Action(Drawer_ModeSettingsRealtime),      // Realtime
                CED.Action(Drawer_ModeSettingsCustom)         // Custom
        public static readonly CED.IDrawer SectionInfluenceVolumeSettings = CED.FoldoutGroup(
            "Influence volume settings",
            (s, p, o) => s.isSectionExpandedInfluenceVolume,
-            true,
+            FoldoutOption.Indent,
-                false,
+                FadeOption.Animate,
                CED.Action(Drawer_InfluenceBoxSettings),      // Box
                CED.Action(Drawer_InfluenceSphereSettings)    // Sphere
            )/*,
        public static readonly CED.IDrawer SectionSeparateProjectionVolumeSettings = CED.FadeGroup(
            (s, p, o, i) => s.isSectionExpandedSeparateProjection,
-            false,
+            FadeOption.Animate,
-                true,
+                FoldoutOption.Indent,
-                    false,
+                    FadeOption.Animate,
                    CED.Action(Drawer_ProjectionBoxSettings), // Box
                    CED.Action(Drawer_ProjectionSphereSettings) // Sphere
                )
        public static readonly CED.IDrawer SectionCaptureSettings = CED.FoldoutGroup(
            "Capture settings",
            (s, p, o) => s.isSectionExpandedCaptureSettings,
-            true,
+            FoldoutOption.Indent,
            CED.Action(Drawer_CaptureSettings)
        );

-            true,
+            FoldoutOption.Indent,
            CED.Action(Drawer_AdditionalSettings)
        );

--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.Drawers.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/PlanarReflectionProbeUI.Drawers.cs
        public static readonly CED.IDrawer SectionFoldoutInfluenceSettings = CED.FoldoutGroup(
            "Influence Settings",
            (s, d, o) => s.isSectionExpandedInfluenceSettings,
-            true,
+            FoldoutOption.Indent,
            CED.Action(Drawer_SectionInfluenceSettings)
        );

            SectionFoldoutCaptureSettings = CED.FoldoutGroup(
                "Capture Settings",
                (s, d, o) => s.isSectionExpandedCaptureSettings,
-                true,
+                FoldoutOption.Indent,
                CED.Action(Drawer_SectionCaptureSettings),
                CED.FadeGroup(
                    (s, d, o, i) =>
                            case 1: return s.isSectionExpandedCaptureStaticSettings;
                        }
                    },
-                    false,
+                    FadeOption.Animate,
                    SectionCaptureMirrorSettings,
                    SectionCaptureStaticSettings)
            );
                CED.FadeGroup(
                    (s, d, o, i) => s.IsSectionExpandedReflectionProbeMode((ReflectionProbeMode)i),
-                    true,
+                    FadeOption.Animate | FadeOption.Indent,
                    SectionProbeModeBakedSettings,
                    SectionProbeModeRealtimeSettings,
                    SectionProbeModeCustomSettings
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
                CED.Action(Drawer_FieldShapeType),
                CED.FadeGroup(
                    (s, d, o, i) => s.IsSectionExpanded_Shape((ShapeType)i),
-                    true,
+                    FadeOption.Animate | FadeOption.Indent,
                    SectionShapeBox,
                    SectionShapeSphere
                )
                CED.FoldoutGroup(
                    "Influence Volume",
                    (s, d, o) => s.isSectionExpandedShape,
-                    true,
+                    FoldoutOption.Indent,
-                        false,
+                        FadeOption.Animate,
                        SectionShapeBox,
                        SectionShapeSphere
                    )
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/ProxyVolumeUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Lighting/Reflection/Volume/ProxyVolumeUI.cs
                CED.Action(Drawer_FieldShapeType),
                CED.FadeGroup(
                    (s, d, o, i) => s.IsSectionExpanded_Shape((ShapeType)i),
-                    true,
+                    FadeOption.Animate | FadeOption.Indent,
                    SectionShapeBox,
                    SectionShapeSphere
                )
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/FrameSettingsUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/FrameSettingsUI.cs
        public static CED.IDrawer SectionRenderingPasses = CED.FoldoutGroup(
            "Rendering Passes",
            (s, p, o) => s.isSectionExpandedRenderingPasses,
-            true,
+            FoldoutOption.Indent,
            CED.LabelWidth(200, CED.Action(Drawer_SectionRenderingPasses))
            );

-            true,
+            FoldoutOption.Indent,
-                    false,
+                    FadeOption.Animate,
-                        true,
+                        FadeOption.Animate | FadeOption.Indent,
                        CED.Action(Drawer_FieldRenderAlphaTestOnlyInDeferredPrepass))),
                CED.Action(Drawer_SectionOtherRenderingSettings)
            )
            (s, d, o, i) => s.isSectionExpandedXRSupported,
-            false,
+            FadeOption.Animate,
-                true,
+                FoldoutOption.Indent,
-            true,
+            FoldoutOption.Indent,
            CED.LabelWidth(250, CED.Action(Drawer_SectionLightingSettings)));

        public AnimBool isSectionExpandedRenderingPasses { get { return m_AnimBools[0]; } }
--- a/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/LightLoopSettingsUI.cs
+++ b/ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/LightLoopSettingsUI.cs
        public static CED.IDrawer SectionLightLoopSettings = CED.FoldoutGroup(
            "Light Loop Settings",
            (s, p, o) => s.isSectionExpandedLightLoopSettings,
-            true,
+            FoldoutOption.Indent,
            CED.LabelWidth(250, CED.Action(Drawer_SectionLightLoopSettings)));

        public AnimBool isSectionExpandedLightLoopSettings { get { return m_AnimBools[0]; } }