Internal/2022.3/staging

Packages/com.unity.render-pipelines.core/CHANGELOG.md

@@ -9,6 +9,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Version Updated
 The version number for this package has increased due to a version update of a related graphics package.
 
+## [14.0.7] - 2023-05-23
+
+This version is compatible with Unity 2022.2.22f1.
+
+### Fixed
+- Fixed Decal Projector Editor fields so they are now saved when editing a prefab.
+- Revert Property for animation curves on Volume Components
+- Fixed an IES Importer issue producing incorrect results.
+- Crash on keywords::LocalKeywordState::ResetWithSpace when shader contains Grab Pass.
+- Fixed SRPs not being able to build using mode -nographics and -batchmode, since lens flare global texture prevents this from happening.
+
 ## [14.0.6] - 2023-03-24
 
 This version is compatible with Unity 2022.2.13f1.

Packages/com.unity.render-pipelines.core/Editor/Analytics/DebugManagerWidgetUsedAnalytic.cs

@@ -0,0 +1,38 @@
+using System.Diagnostics;
+using UnityEngine.Analytics;
+
+namespace UnityEditor.Rendering.Analytics
+{
+    // schema = com.unity3d.data.schemas.editor.analytics.uDebugManagerWidgetUsedAnalytic_v1
+    // taxonomy = editor.analytics.uDebugManagerWidgetUsedAnalytic.v1
+    internal class DebugManagerWidgetUsedAnalytic
+    {
+        const int k_MaxEventsPerHour = 1000;
+        const int k_MaxNumberOfElements = 1000;
+        const string k_VendorKey = "unity.srp";
+
+        [DebuggerDisplay("{query_path} - {value}")]
+        class Data
+        {
+            internal const string k_EventName = "uDebugManagerWidgetUsedAnalytic";
+
+            // Naming convention for analytics data
+            public string query_path;
+            public string value;
+        }
+
+        public static void Send(string path, object value)
+        {
+            if (EditorAnalytics.enabled &&
+                EditorAnalytics.RegisterEventWithLimit(Data.k_EventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey) == AnalyticsResult.Ok)
+            {
+                using (UnityEngine.Pool.GenericPool<Data>.Get(out var data))
+                {
+                    data.query_path = path;
+                    data.value = value.ToString();
+                    EditorAnalytics.SendEventWithLimit(Data.k_EventName, data);
+                }
+            }
+        }
+    }
+}

Packages/com.unity.render-pipelines.core/Editor/Analytics/DebugManagerWindowLifetimeAnalytic.cs

@@ -0,0 +1,78 @@
+using System;
+using System.Diagnostics;
+using System.Linq;
+using UnityEngine.Analytics;
+using UnityEngine.Rendering;
+
+namespace UnityEditor.Rendering.Analytics
+{
+    // schema = com.unity3d.data.schemas.editor.analytics.uDebugManagerWindowLifetimeAnalytic_v1
+    // taxonomy = editor.analytics.uDebugManagerWindowLifetimeAnalytic.v1
+    internal class DebugManagerWindowLifetimeAnalytic
+    {
+        const int k_MaxEventsPerHour = 10;
+        const int k_MaxNumberOfElements = 1000;
+        const string k_VendorKey = "unity.srp";
+
+        private static DateTime?[] timeStamps = new DateTime?[2] { null, null};
+
+        [InitializeOnLoadMethod]
+        static void SubscribeToDebugManagerOpenCloseWindows()
+        {
+            DebugManager.windowStateChanged += OnWindowStateChanged;
+            AssemblyReloadEvents.beforeAssemblyReload += OnBeforeAssemblyReload;
+        }
+
+        private static void OnBeforeAssemblyReload()
+        {
+            AssemblyReloadEvents.beforeAssemblyReload -= OnBeforeAssemblyReload;
+            DebugManager.windowStateChanged -= OnWindowStateChanged;
+        }
+
+        private static void OnWindowStateChanged(DebugManager.UIMode windowMode, bool open)
+        {
+            try
+            {
+                if (!timeStamps[(int)windowMode].HasValue)
+                {
+                    timeStamps[(int)windowMode] = DateTime.Now;
+                }
+                else
+                {
+                    Send(windowMode, timeStamps[(int)windowMode].Value);
+                    timeStamps[(int)windowMode] = null;
+                }
+            }
+            catch
+            {
+                // ignored, do not let analytics throw an error
+            }
+        }
+
+        [DebuggerDisplay("{window_mode} - {seconds_opened}")]
+        class Data
+        {
+            internal const string k_EventName = "uDebugManagerWindowLifetimeAnalytic";
+
+            // Naming convention for analytics data
+            public string window_mode;
+            public int seconds_opened;
+        }
+
+        static void Send(DebugManager.UIMode windowMode, DateTime start)
+        {
+            var elapsed = DateTime.Now - start;
+
+            if (EditorAnalytics.enabled &&
+                EditorAnalytics.RegisterEventWithLimit(Data.k_EventName, k_MaxEventsPerHour, k_MaxNumberOfElements, k_VendorKey) == AnalyticsResult.Ok)
+            {
+                using (UnityEngine.Pool.GenericPool<Data>.Get(out var data))
+                {
+                    data.window_mode = windowMode.ToString();
+                    data.seconds_opened = elapsed.Seconds;
+                    EditorAnalytics.SendEventWithLimit(Data.k_EventName, data);
+                }
+            }
+        }
+    }
+}

Packages/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Rendering.Drawers.cs

@@ -19,9 +19,6 @@ public static void Drawer_Rendering_StopNaNs(ISerializedCamera p, Editor owner)
             public static void Drawer_Rendering_Dithering(ISerializedCamera p, Editor owner)
             {
                 EditorGUILayout.PropertyField(p.dithering, Styles.dithering);
-
-                if (PlayerSettings.useHDRDisplay && p.dithering.boolValue)
-                    EditorGUILayout.HelpBox(Styles.unsupportedDitheringWithHDROutputWarning, MessageType.Warning);
             }
 
             /// <summary>Draws Culling mask related fields on the inspector</summary>

Packages/com.unity.render-pipelines.core/Editor/Camera/CameraUI.Rendering.Skin.cs

@@ -54,9 +54,6 @@ public static class Styles
                 /// exposureTarget content
                 /// </summary>
                 public static readonly GUIContent exposureTarget = EditorGUIUtility.TrTextContent("Exposure Target", "The object used as a target for centering the Exposure's Procedural Mask metering mode when target object option is set (See Exposure Volume Component).");
-
-                /// <summary>Unity does not support dithering with HDR display output.</summary>
-                public static readonly string unsupportedDitheringWithHDROutputWarning = L10n.Tr("Unity does not support dithering with HDR display output.");
             }
         }
     }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugUIDrawer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using UnityEditor.Rendering.Analytics;
 using UnityEngine;
 using UnityEngine.Rendering;
 
@@ -184,6 +185,8 @@ public override void End(DebugUI.Widget widget, DebugState state)
                 var w = Cast<TField>(widget);
                 var s = Cast<TState>(state);
                 Apply(w, s, value);
+
+                DebugManagerWidgetUsedAnalytic.Send(widget.queryPath, value);
             }
         }
     }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -59,18 +59,11 @@ sealed class DebugWindow : EditorWindow, IHasCustomMenu
         static Dictionary<Type, Type> s_WidgetStateMap; // DebugUI.Widget type -> DebugState type
         static Dictionary<Type, DebugUIDrawer> s_WidgetDrawerMap; // DebugUI.Widget type -> DebugUIDrawer
 
-        static bool s_Open;
         public static bool open
         {
-            get => s_Open;
-            private set
-            {
-                if (s_Open ^ value)
-                    OnDebugWindowToggled?.Invoke(value);
-                s_Open = value;
-            }
+            get => DebugManager.instance.displayEditorUI;
+            private set => DebugManager.instance.displayEditorUI = value;
         }
-        static event Action<bool> OnDebugWindowToggled;
 
         [DidReloadScripts]
         static void OnEditorReload()
@@ -79,9 +72,6 @@ static void OnEditorReload()
 
             //find if it where open, relink static event end propagate the info
             open = (Resources.FindObjectsOfTypeAll<DebugWindow>()?.Length ?? 0) > 0;
-            if (OnDebugWindowToggled == null)
-                OnDebugWindowToggled += DebugManager.instance.ToggleEditorUI;
-            DebugManager.instance.ToggleEditorUI(open);
         }
 
         static void RebuildTypeMaps()
@@ -141,9 +131,6 @@ static bool ValidateMenuItem()
 
         void OnEnable()
         {
-            if (OnDebugWindowToggled == null)
-                OnDebugWindowToggled += DebugManager.instance.ToggleEditorUI;
-
             open = true;
 
             DebugManager.instance.refreshEditorRequested = false;

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

@@ -146,7 +146,7 @@ public override void OnInspectorGUI()
 
                 if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP)
                 {
-                    EditorGUILayout.HelpBox("The probe volumes feature is disabled. The feature needs to be enabled on the used HDRP asset.", MessageType.Warning, wide: true);
+                    ProbeVolumeEditor.APVDisabledHelpBox();
                     return;
                 }
 

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

@@ -158,8 +158,6 @@ void Initialize()
             m_ProbeSceneData = m_SerializedObject.FindProperty(sceneData.parentSceneDataPropertyName);
 
             InitializeBakingSetList();
-            InitializeScenarioList();
-            UpdateScenariosStatuses();
 
             Lightmapping.lightingDataCleared += UpdateScenariosStatuses;
             EditorSceneManager.sceneOpened += OnSceneOpened;
@@ -487,10 +485,6 @@ void RefreshAfterUndo()
             }
 
             InitializeBakingSetList();
-            InitializeScenarioList();
-            UpdateScenariosStatuses();
-
-            OnBakingSetSelected(m_BakingSets);
 
             Repaint();
         }
@@ -529,6 +523,8 @@ void OnBakingSetSelected(ReorderableList list)
             // Update left panel data
             EditorPrefs.SetInt(k_SelectedBakingSetKey, list.index);
             var set = GetCurrentBakingSet();
+            if (set == null)
+                return;
 
             m_ScenesInSet = new ReorderableList(set.sceneGUIDs, typeof(string), true, true, true, true);
             m_ScenesInSet.drawHeaderCallback = (rect) => EditorGUI.LabelField(rect, "Scenes", EditorStyles.largeLabel);
@@ -619,7 +615,10 @@ void TryAddScene(SceneData scene)
 
         ProbeVolumeSceneData.BakingSet GetCurrentBakingSet()
         {
-            int index = Mathf.Clamp(m_BakingSets.index, 0, sceneData.bakingSets.Count - 1);
+            int index = Mathf.Max(m_BakingSets.index, 0);
+            if (index >= sceneData.bakingSets.Count)
+                return null;
+
             return sceneData.bakingSets[index];
         }
 
@@ -647,19 +646,9 @@ bool AllSetScenesAreLoaded()
 
         void OnGUI()
         {
-            // TODO: add the toolbar with search field for the list
-            // DrawToolbar();
-
-            string apvDisabledErrorMsg = "The Probe Volume is not enabled.";
-            var renderPipelineAsset = GraphicsSettings.renderPipelineAsset;
-            if (renderPipelineAsset != null && renderPipelineAsset.GetType().Name == "HDRenderPipelineAsset")
-            {
-                apvDisabledErrorMsg += " Make sure it is enabled in the HDRP Global Settings and in the HDRP asset in use.";
-            }
-
             if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP)
             {
-                EditorGUILayout.HelpBox(apvDisabledErrorMsg, MessageType.Error);
+                ProbeVolumeEditor.APVDisabledHelpBox();
                 return;
             }
 
@@ -729,17 +718,19 @@ void DrawRightPanel()
                     OpenProbeVolumeDebugPanel();
             }
 
-            EditorGUILayout.Space();
-            SanitizeScenes();
-            m_ScenesInSet.DoLayoutList();
+            var set = GetCurrentBakingSet();
+            if (set != null)
+            {
+                EditorGUILayout.Space();
+                SanitizeScenes();
+                m_ScenesInSet.DoLayoutList();
 
-            EditorGUILayout.Space();
-            m_Scenarios.Select(GetCurrentBakingSet().lightingScenarios.IndexOf(ProbeReferenceVolume.instance.lightingScenario));
-            m_Scenarios.DoLayoutList();
+                EditorGUILayout.Space();
+                m_Scenarios.Select(GetCurrentBakingSet().lightingScenarios.IndexOf(ProbeReferenceVolume.instance.lightingScenario));
+                m_Scenarios.DoLayoutList();
+            }
 
-            var set = GetCurrentBakingSet();
-            var sceneGUID = sceneData.GetFirstProbeVolumeSceneGUID(set);
-            if (sceneGUID != null)
+            if (set != null && sceneData.GetFirstProbeVolumeSceneGUID(set) != null)
             {
                 EditorGUILayout.Space();
 
@@ -805,6 +796,10 @@ void DelayCreateAsset()
                     EditorGUI.indentLevel--;
                 }
             }
+            else if (set == null)
+            {
+                EditorGUILayout.HelpBox("You need to create at least one baking set to bake Probe Volumes.", MessageType.Info, true);
+            }
             else
             {
                 EditorGUILayout.HelpBox("You need to assign at least one scene with probe volumes to configure the baking settings", MessageType.Error, true);
@@ -813,7 +808,8 @@ void DelayCreateAsset()
             EditorGUILayout.EndScrollView();
 
             EditorGUILayout.Space();
-            DrawBakeButton();
+            using (new EditorGUI.DisabledScope(set == null))
+                DrawBakeButton();
 
             EditorGUILayout.EndVertical();
         }