Merge pull request #8137 from Unity-Technologies/internal/master

Internal/master

Author: UnityAljosha

Packages/com.unity.render-pipelines.core/Documentation~/Look-Dev-Environment-Library.md

@@ -4,7 +4,7 @@ An Environment Library is an Asset that contains a list of environments that you
 
 <a name="Creation"></a>
 
-![](Images/LookDevEnvironmentLibrary1.png)
+![Environment Library asset.](Images/LookDevEnvironmentLibrary1.png)
 
 ## Creating an Environment Library
 
@@ -26,13 +26,13 @@ To add, remove, or duplicate environments, use the toolbar at the bottom of the
 
 | **Button**                                                   | **Function**  | **Description**                                              |
 | ------------------------------------------------------------ | ------------- | ------------------------------------------------------------ |
-| ![](Images/LookDevEnvironmentLibrary2.png) | **Add**       | Click this button to add a new environment to the bottom of the list. |
-| ![](Images/LookDevEnvironmentLibrary3.png) | **Remove**    | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
-| ![](Images/LookDevEnvironmentLibrary4.png)                   | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
+| ![This button adds a new environment to the bottom of the list.](Images/LookDevEnvironmentLibrary2.png) | **Add**       | Click this button to add a new environment to the bottom of the list. |
+| ![This button removes the currently selected environment.](Images/LookDevEnvironmentLibrary3.png) | **Remove**    | Click this button to remove the environment currently selected. Note that the environment that you have selected is the one with the blue frame. |
+| ![This button duplicates the currently selected environment.](Images/LookDevEnvironmentLibrary4.png)                   | **Duplicate** | Click this button to duplicate the currently selected environment and add it as a new environment to the bottom of the list. |
 
 ## Properties
 
-![](Images/LookDevEnvironmentLibrary5.png)
+![Environment Library properties](Images/LookDevEnvironmentLibrary5.png)
 
 | **Property**        | **Description**                                              |
 | ------------------- | ------------------------------------------------------------ |

Packages/com.unity.render-pipelines.core/Documentation~/Look-Dev.md

@@ -46,15 +46,15 @@ Use the toolbar in the top-left of the window to change which viewing mode Look
 
 ### Single viewport
 
-![](Images/LookDev1.png)
+![Buttons for switching between viewports 1 and 2.](Images/LookDev1.png)
 
 By default, Look Dev displays a single viewport which contains the Prefab or GameObject you are working with. If you are in another viewing mode, you can click either the number **1** or number **2** button to go back to single view. Each button corresponds to a viewport in Look Dev. Select button **1** to use viewport 1, and button 2 to use viewport **2**.
 
 <a name="MultiView"></a>
 
 ### Multi-viewport
 
-![](Images/LookDev2.png)
+![Buttons for changing the multi-viewport mode.](Images/LookDev2.png)
 
 Use multiple viewports to compare different environments and settings for the same Asset. You can arrange viewports:
 
@@ -73,23 +73,21 @@ When using multiple viewports, it only makes sense to compare different Prefabs
 
 Vertical and horizontal side-by-side viewports show an identical view of your Asset.
 
-![](Images/LookDev3.png)
+![Vertical side-by-side viewport view.](Images/LookDev3.png)
 
 ##### Split-screen
 
 In a split-screen view, there is a red/blue manipulation Gizmo that separates the two viewports. For information on how to use this Gizmo, see [Using the manipulation Gizmo](#ManipulationGizmo).
 
-![](Images/LookDev4.png)
+![Split-screen viewport view.](Images/LookDev4.png)
 
 #### Multi-viewport Camera
 
 By default, Look Dev synchronizes the camera movement for both views. To decouple the Cameras from one another, and manipulate them independently, click the **Synchronized Cameras** button in-between the two numbered Camera buttons.
 
-![](Images/LookDev5.png)
-
 To align the cameras with each other, or reset them, click on the drop-down arrow next to the viewport **2** icon:
 
-![](Images/LookDev6.png)
+![Drop-down options of multi-viewport cameras.](Images/LookDev6.png)
 
 <a name="ManipulationGizmo"></a>
 
@@ -101,13 +99,11 @@ The manipulation Gizmo represents the separation plane between the two viewports
 
 To move the separator, click and drag the straight line of the Gizmo to the location you want.
 
-![](Images/LookDev7.png)
-
 #### Changing the orientation and length
 
 To change the orientation and length of the manipulator Gizmo, click and drag the circle at either end of the manipulator. Changing the length of the Gizmo lets you  set the orientation and [blending](#Blending) values more precisely.
 
-![](Images/LookDev8.png))
+![Click and drag the circle at either end of the gizmo to change its orientation and length.](Images/LookDev8.png)
 
 #### Changing the split in increments
 
@@ -121,7 +117,7 @@ The central white circle on the separator allows you to blend between the two vi
 
 The white circle automatically snaps back into the center when you drag it back. This helps you get back to the default blending value quickly.
 
-![](Images/LookDev9.png)
+![The white circle on the separator lets you change the blending behavior.](Images/LookDev9.png)
 
 ### HDRI environments in Look Dev
 

Packages/com.unity.render-pipelines.core/Editor/HeaderFoldout.cs

@@ -9,15 +9,21 @@ namespace UnityEditor.Rendering
     public partial class HeaderFoldout : Foldout
     {
         const string k_StylesheetPathFormat = "Packages/com.unity.render-pipelines.core/Editor/StyleSheets/HeaderFoldout{0}.uss";
-        const string k_Class = "header-foldout";
-        const string k_IconName = "header-foldout__icon";
+        const string k_MainClass = "header-foldout";
+        const string k_EnableClass = k_MainClass + "__enable";
+        const string k_IconClass = k_MainClass + "__icon";
+        const string k_LabelClass = k_MainClass + "__label";
+        const string k_HelpButtonClass = k_MainClass + "__help-button";
+        const string k_ContextButtonClass = k_MainClass + "__context-button";
 
         private string m_DocumentationURL;
         private Texture2D m_Icon;
         private Func<GenericMenu> m_ContextMenuGenerator;
         private VisualElement m_HelpButton;
         private VisualElement m_ContextMenuButton;
         private VisualElement m_IconElement;
+        private Toggle m_Toggle;
+        private Label m_Text;
 
         /// <summary>URL to use on documentation icon. If null, button don't show.</summary>
         public string documentationURL
@@ -61,92 +67,109 @@ public Texture2D icon
                 m_IconElement.style.display = m_Icon != null ? DisplayStyle.Flex : DisplayStyle.None;
             }
         }
+        
+        /// <summary>Property to get the enablement state</summary>
+        public bool enabled
+        {
+            get => m_Toggle.value;
+            set => m_Toggle.value = value;
+        }
+        
+        /// <summary>Property to get the enablement visibility state</summary>
+        public bool showEnableCheckbox
+        {
+            get => m_Toggle.style.display == DisplayStyle.Flex;
+            set => m_Toggle.style.display = value ? DisplayStyle.Flex : DisplayStyle.None;
+        }
+
+        /// <summary>Quick access to the enable toggle if one need to register events</summary>
+        public Toggle enableToggle => m_Toggle;
+
+        /// <summary>Property to get the title</summary>
+        public new string text
+        {
+            get => m_Text.text;
+            set => m_Text.text = value;
+        }
 
         /// <summary>Constructor</summary>
         public HeaderFoldout() : base()
         {
             styleSheets.Add(AssetDatabase.LoadAssetAtPath<StyleSheet>(string.Format(k_StylesheetPathFormat, "")));
             styleSheets.Add(AssetDatabase.LoadAssetAtPath<StyleSheet>(string.Format(k_StylesheetPathFormat, EditorGUIUtility.isProSkin ? "Dark" : "Light")));
-            AddToClassList(k_Class);
+            AddToClassList(k_MainClass);
 
             RegisterCallback<AttachToPanelEvent>(DelayedInit);
 
             var line = hierarchy[0][0]; //pass by herarchy to ignore content redirection
 
+            m_IconElement = new Image()
+            {
+                style =
+                {
+                    display = DisplayStyle.None // hidden by default, will be enabled if icon is set
+                }
+            };
+            m_IconElement.AddToClassList(k_IconClass);
+            line.Add(m_IconElement);
+
+            m_Toggle = new Toggle() 
+            {
+                value = true
+            };
+            m_Toggle.AddToClassList(k_EnableClass);
+            m_Toggle.RegisterValueChangedCallback(HandleDisabling);
+            m_Toggle.style.display = DisplayStyle.None; // hidden by default
+            line.Add(m_Toggle);
+
+            m_Text = new Label();
+            m_Text.AddToClassList(k_LabelClass);
+            line.Add(m_Text);
+
             m_HelpButton = new Button(Background.FromTexture2D(CoreEditorStyles.iconHelp), () => Help.BrowseURL(m_DocumentationURL));
+            m_HelpButton.AddToClassList(k_HelpButtonClass);
             m_HelpButton.SetEnabled(!string.IsNullOrEmpty(m_DocumentationURL));
             line.Add(m_HelpButton);
 
-            m_ContextMenuButton =
-                new Button(Background.FromTexture2D(CoreEditorStyles.paneOptionsIcon), () => ShowMenu())
-                {
-                    style =
-                    {
-                        paddingRight = 2
-                    }
-                };
-
+            m_ContextMenuButton = new Button(Background.FromTexture2D(CoreEditorStyles.paneOptionsIcon), () => ShowMenu());
+            m_ContextMenuButton.AddToClassList(k_ContextButtonClass);
             m_ContextMenuButton.SetEnabled(m_ContextMenuGenerator != null);
             line.Add(m_ContextMenuButton);
-            
-            m_IconElement = new Image();
-            m_IconElement.name = k_IconName;
-            m_IconElement.style.display = DisplayStyle.None; // Disable by default, will be enabled if icon is set
-            // Delay insertion of icon to happen after foldout is constructed so we can put it in the right place
-            RegisterCallbackOnce<AttachToPanelEvent>(evt => line.Insert(1, m_IconElement));
         }
 
         void DelayedInit(AttachToPanelEvent evt)
         {
             //Only show top line if previous item is not a HeaderFoldout to avoid bolder border
-            bool shouldShowTopLine = true;
             var parent = hierarchy.parent;
             int posInParent = parent.hierarchy.IndexOf(this);
-            if (posInParent > 0 && parent[posInParent - 1].ClassListContains(k_Class))
-                shouldShowTopLine = false;
+            if (posInParent == 0 || !parent[posInParent - 1].ClassListContains(k_MainClass))
+                AddToClassList("first-in-collection");
 
-            style.borderTopWidth = shouldShowTopLine ? 1 : 0;
+            //fix to transfer label assigned in UXML from base label to new label
+            if (!string.IsNullOrEmpty(base.text))
+            {
+                if (string.IsNullOrEmpty(m_Text.text))
+                    m_Text.text = base.text;
+                base.text = null;
+            }
         }
 
         void ShowMenu()
         {
             var menu = m_ContextMenuGenerator.Invoke();
             menu.DropDown(new Rect(m_ContextMenuButton.worldBound.position + m_ContextMenuButton.worldBound.size.y * Vector2.up, Vector2.zero));
         }
+
+        void HandleDisabling(ChangeEvent<bool> evt)
+            => contentContainer.SetEnabled(evt.newValue);
     }
 
     /// <summary> UITK component to display header styled foldout. This variant have an enable checkbox.</summary>
+    [Obsolete("Please directly use HeaderFoldout now #from(6000.2) (UnityUpgradable) -> HeaderFoldout", false)]
     public class HeaderToggleFoldout : HeaderFoldout
     {
-        private Toggle m_Toggle;
-
-        /// <summary>Property to get the enablement state</summary>
-        public bool enabled
-        {
-            get => m_Toggle.value;
-            set => m_Toggle.value = value;
-        }
-
-        /// <summary>Quick access to the enable toggle if one need to register events</summary>
-        public Toggle enableToggle => m_Toggle;
-        
         /// <summary>Constructor</summary>
         public HeaderToggleFoldout() : base()
-        {
-            var line = hierarchy[0][0]; //pass by herarchy to ignore content redirection
-            m_Toggle = new Toggle() 
-            { 
-                value = true,
-                name = "enable-checkbox",
-            };
-
-            //Need to delay insertion as foldout will be constructed after and we need to squeeze rigth after
-            RegisterCallbackOnce<AttachToPanelEvent>(evt => line.Insert(1, m_Toggle));
-
-            m_Toggle.RegisterValueChangedCallback(HandleDisabling);
-        }
-
-        void HandleDisabling(ChangeEvent<bool> evt)
-            => contentContainer.SetEnabled(evt.newValue);
+            => showEnableCheckbox = true;
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.Serialization.cs

@@ -1070,7 +1070,11 @@ unsafe static void WriteBakingCells(BakingCell[] bakingCells)
 
             AssetDatabase.ImportAsset(cellDataFilename);
             AssetDatabase.ImportAsset(cellOptionalDataFilename);
-            AssetDatabase.ImportAsset(cellProbeOcclusionDataFilename);
+            // If we did not write a probe occlusion file (because it was zero bytes), don't try to load it (UUM-101480)
+            if (probeOcclusion.Length > 0)
+            {
+                AssetDatabase.ImportAsset(cellProbeOcclusionDataFilename);
+            }
             AssetDatabase.ImportAsset(cellBricksDataFilename);
             AssetDatabase.ImportAsset(cellSharedDataFilename);
             AssetDatabase.ImportAsset(cellSupportDataFilename);

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs

@@ -372,6 +372,8 @@ void BakingGUI()
             {
                 if (newSet != null) { EditorUtility.SetDirty(newSet); newSet.singleSceneMode = false; }
                 activeSet = newSet;
+
+                ProbeReferenceVolume.instance.Clear();
                 ProbeReferenceVolume.instance.SetActiveBakingSet(activeSet);
             }
 
@@ -525,7 +527,7 @@ void UseTemporaryBakingSet(string sceneGUID, ProbeVolumeBakingSet set = null)
                 set = ScriptableObject.CreateInstance<ProbeVolumeBakingSet>();
                 set.SetDefaults();
 
-                ProbeReferenceVolume.instance.AddPendingSceneRemoval(sceneGUID);
+                ProbeReferenceVolume.instance.Clear();
             }
 
             EditorUtility.SetDirty(set);

Packages/com.unity.render-pipelines.core/Editor/Properties/AdvancedProperties.cs

@@ -120,7 +120,10 @@ public static bool BeginGroup(AnimFloat animation = null)
 
             animation ??= s_AnimFloat;
 
-            GUI.color = Color.Lerp(CoreEditorStyles.backgroundColor * oldColor, CoreEditorStyles.backgroundHighlightColor, animation.value);
+            Color transparent = CoreEditorStyles.backgroundHighlightColor;
+            transparent.a = 0f;
+
+            GUI.color = Color.Lerp(transparent, CoreEditorStyles.backgroundHighlightColor, animation.value);
             EditorGUILayout.BeginVertical(CoreEditorStyles.additionalPropertiesHighlightStyle);
             GUI.color = oldColor;
 

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.SidePanel.cs

@@ -66,7 +66,11 @@ void InitializeSidePanel()
             rootVisualElement.RegisterCallback<GeometryChangedEvent>(_ =>
             {
                 SaveSplitViewFixedPaneHeight(); // Window resized - save the current pane height
-                UpdatePanelHeights();
+
+                // TwoPaneSplitView also updates draglineanchor offset using the same event, conflicting with what we
+                // do here. Deferring our panel height update to next frame solves a bug with dragline "jumping" when
+                // window is resized down vertically and the lower panel is already at minimum height.
+                rootVisualElement.schedule.Execute(UpdatePanelHeights);
             });
 
             var contentSplitView = rootVisualElement.Q<TwoPaneSplitView>(Names.kContentContainer);

Packages/com.unity.render-pipelines.core/Editor/RenderGraph/RenderGraphViewer.cs

@@ -35,6 +35,7 @@ static partial class Names
             public const string kGridlineContainer = "grid-line-container";
             public const string kHoverOverlay = "hover-overlay";
             public const string kEmptyStateMessage = "empty-state-message";
+            public const string kPassListCornerOccluder = "pass-list-corner-occluder";
         }
 
         static partial class Classes
@@ -191,6 +192,7 @@ static void Init()
         {
             var window = GetWindow<RenderGraphViewer>();
             window.titleContent = new GUIContent("Render Graph Viewer");
+            window.minSize = new Vector2(880f, 300f);
         }
 
         [Flags]
@@ -1817,6 +1819,27 @@ void RebuildUI()
             RebuildGraphViewerUI();
         }
 
+        void RerouteWheelEvent(VisualElement source, VisualElement target)
+        {
+            source.RegisterCallback<WheelEvent>(evt =>
+            {
+                evt.StopImmediatePropagation();
+
+                // Need to create an intermediate Event to be able to call WheelEvent.GetPooled()
+                var imguiEvt = new Event {
+                    type = EventType.ScrollWheel,
+                    delta = new Vector2(evt.delta.x, evt.delta.y),
+                    mousePosition = evt.mousePosition,
+                    modifiers = evt.modifiers
+                };
+                using (var newEvt = WheelEvent.GetPooled(imguiEvt))
+                {
+                    newEvt.target = target;
+                    target.SendEvent(newEvt);
+                }
+            }, TrickleDown.TrickleDown);
+        }
+
         // Initialize, register callbacks & manipulators etc. once
         void InitializePersistentElements()
         {
@@ -1881,9 +1904,12 @@ void InitializePersistentElements()
             resourceGridScrollView.horizontalScroller.valueChanged += value =>
                 passListScrollView.scrollOffset = new Vector2(value, passListScrollView.scrollOffset.y);
 
-            // Disable mouse wheel on the scroll views that are synced to the resource grid
-            resourceListScrollView.RegisterCallback<WheelEvent>(evt => evt.StopImmediatePropagation(), TrickleDown.TrickleDown);
-            passListScrollView.RegisterCallback<WheelEvent>(evt => evt.StopImmediatePropagation(), TrickleDown.TrickleDown);
+            // Scroll views are synced to the resource grid, so we don't want them to scroll independently. To have
+            // consistent behavior, redirect the wheel events to the resource grid and let it handle them.
+            RerouteWheelEvent(resourceListScrollView, resourceGridScrollView);
+            RerouteWheelEvent(passListScrollView, resourceGridScrollView);
+            var passListCornerOccluder = rootVisualElement.Q<VisualElement>(Names.kPassListCornerOccluder);
+            RerouteWheelEvent(passListCornerOccluder, resourceGridScrollView);
 
             InitializeSidePanel();
         }