mirror Internal/master

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/AssetsConverter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using UnityEngine;
 
 namespace UnityEditor.Rendering.Converter
 {
@@ -24,16 +25,42 @@ void OnSearchFinish()
                 onScanFinish?.Invoke(returnList);
             }
 
+            var processedIds = new HashSet<string>();
+
             SearchServiceUtils.RunQueuedSearch
             (
                 SearchServiceUtils.IndexingOptions.DeepSearch,
                 contextSearchQueriesAndIds,
                 (item, description) =>
                 {
-                    var assetItem = new RenderPipelineConverterAssetItem(item.id)
+                    // Direct conversion - works for both assets and scene objects
+                    var unityObject = item.ToObject();
+
+                    if (unityObject == null)
+                            return;
+
+                    // Ensure we're always working with GameObjects
+                    GameObject go = null;
+
+                    if (unityObject is GameObject gameObject)
+                        go = gameObject;
+                    else if (unityObject is Component component)
+                        go = component.gameObject;
+                    else
+                        return; // Not a GameObject or Component
+
+                    var gid = GlobalObjectId.GetGlobalObjectIdSlow(go);
+                    if (!processedIds.Add(gid.ToString()))
+                        return;
+
+                    int type = gid.identifierType; // 1=Asset, 2=SceneObject
+
+                    var assetItem = new RenderPipelineConverterAssetItem(gid.ToString())
                     {
-                        info = description
+                        name = $"{unityObject.name} ({(type == 1 ? "Prefab" : "SceneObject")})",
+                        info = type == 1 ? AssetDatabase.GetAssetPath(unityObject) : go.scene.path,
                     };
+
                     assets.Add(assetItem);
                 },
                 OnSearchFinish

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterAssetItem.cs

@@ -30,7 +30,13 @@ public string guid
 
         public string GlobalObjectId => m_GlobalObjectId;
 
-        public string name => System.IO.Path.GetFileNameWithoutExtension(assetPath);
+        [SerializeField]
+        private string m_Name;
+        public string name
+        {
+            get => string.IsNullOrEmpty(m_Name) ? System.IO.Path.GetFileNameWithoutExtension(assetPath) : m_Name;
+            set => m_Name = value;
+        }
 
         [SerializeField]
         private string m_Info;

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/RenderPipelineConverterMaterialUpgrader.cs

@@ -76,6 +76,9 @@ public void OnClicked()
     [Serializable]
     internal abstract class RenderPipelineConverterMaterialUpgrader : IRenderPipelineConverter
     {
+        public virtual bool isEnabled => m_UpgradersCache != null && m_UpgradersCache.Count > 0;
+        public virtual string isDisabledMessage => "No material upgraders specified for this converter.";
+
         /// <summary>
         /// List of material upgraders to use for this converter.
         /// </summary>

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConverterVisualElement.cs

@@ -37,6 +37,18 @@ internal class RenderPipelineConverterVisualElement : VisualElement
 
         public Action converterSelected;
 
+        private bool m_IsEnabled;
+
+        private void SetEnabled(bool value, bool force = false)
+        {
+            if (m_IsEnabled != value || force)
+            {
+                m_IsEnabled = value;
+                m_HeaderFoldout.tooltip = (m_IsEnabled) ? description : converter.isDisabledMessage;
+                m_HeaderFoldout.SetEnabled(m_IsEnabled);
+            }
+        }
+
         public RenderPipelineConverterVisualElement(Node<ConverterInfo> converterInfo)
         {
             m_ConverterInfo = converterInfo;
@@ -47,8 +59,10 @@ public RenderPipelineConverterVisualElement(Node<ConverterInfo> converterInfo)
 
             m_HeaderFoldout = m_RootVisualElement.Q<HeaderFoldout>("conveterFoldout");
             m_HeaderFoldout.text = displayName;
-            m_HeaderFoldout.tooltip = (converter.isEnabled) ? description : converter.isDisabledMessage;
-            m_HeaderFoldout.SetEnabled(converter.isEnabled);
+
+            SetEnabled(converter.isEnabled, true);
+            m_HeaderFoldout.schedule.Execute(() => SetEnabled(converter.isEnabled)).Every(500);
+
             m_HeaderFoldout.value = state.isExpanded;
             m_HeaderFoldout.RegisterCallback<ChangeEvent<bool>>((evt) =>
             {

Packages/com.unity.render-pipelines.core/Editor-PrivateShared/Tools/Converter/Window/RenderPipelineConvertersEditor.cs

@@ -82,7 +82,16 @@ public static void ShowWindow()
         [MenuItem("Window/Rendering/Render Pipeline Converter", true, 50)]
         public static bool CanShowWindow()
         {
-            return !EditorApplication.isPlaying;
+            if (EditorApplication.isPlaying)
+                return false;
+
+            foreach (var converterType in TypeCache.GetTypesDerivedFrom<IRenderPipelineConverter>())
+            {
+                if (!converterType.IsAbstract && !converterType.IsInterface)
+                    return true;
+            }
+
+            return false;
         }
 
         internal static void DontSaveToLayout(EditorWindow wnd)
@@ -212,7 +221,8 @@ public void CreateGUI()
                     if (converterNodeCategory.name == to.label)
                         currentContainer = converterNodeCategory;
                 }
-                HideUnhideConverters();
+
+                ConfigureUI();
             };
 
             m_SourcePipelineDropDown.RegisterCallback<ChangeEvent<string>>((evt) =>
@@ -225,40 +235,51 @@ public void CreateGUI()
                 HideUnhideConverters();
             });
 
+            ConfigureUI();
+
+            UpdateUiForPlayMode(EditorApplication.isPlaying);
+        }
+
+        private void ConfigureUI()
+        {
             HideUnhideConverters();
             EnableOrDisableScanButton();
             EnableOrDisableConvertButton();
-
-            UpdateUiForPlayMode(EditorApplication.isPlaying);
         }
 
         private bool CanEnableScan()
         {
-            foreach (var kvp in m_ConvertersVisualElements)
+            foreach (var child in currentContainer.children)
             {
-                var ve = kvp.Value;
-                if (ve.isSelectedAndEnabled &&
-                    !ve.state.isInitialized)
+                if (m_ConvertersVisualElements.TryGetValue(child, out var ve))
                 {
-                    return true;
+                    if (ve.isSelectedAndEnabled &&
+                        !ve.state.isInitialized)
+                    {
+                        return true;
+                    }
                 }
             }
+
             return false;
         }
 
         private bool CanEnableConvert()
         {
-            foreach (var kvp in m_ConvertersVisualElements)
+            foreach (var child in currentContainer.children)
             {
-                var ve = kvp.Value;
-                if (ve.isSelectedAndEnabled &&
-                    ve.state.isInitialized &&
-                    ve.state.selectedItemsCount > 0 &&
-                    ve.state.pending > 0)
+                if (m_ConvertersVisualElements.TryGetValue(child, out var ve))
                 {
-                    return true;
+                    if (ve.isSelectedAndEnabled &&
+                        ve.state.isInitialized &&
+                        ve.state.selectedItemsCount > 0 &&
+                        ve.state.pending > 0)
+                    {
+                        return true;
+                    }
                 }
             }
+
             return false;
         }
 

Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchSelectors.cs → Packages/com.unity.render-pipelines.core/Editor/Lighting/LightingSearchColumnProviders.cs

@@ -6,7 +6,7 @@
 
 namespace UnityEditor.Lighting
 {
-    static class CoreLightingSearchSelectors
+    static class CoreLightingSearchColumnProviders
     {
         internal const string k_SceneProvider = "scene";
         internal const string k_BakingSetPath = "BakingSets/";
@@ -18,8 +18,7 @@ static class CoreLightingSearchSelectors
         internal const string k_VolumeModePath = k_VolumePath + "Mode";
         internal const string k_VolumeProfilePath = k_VolumePath + "Profile";
 
-        const string k_StyleSheetPath = "StyleSheets/LightingSearchSelectors.uss";
-        const int k_DefaultSearchSelectorPriority = 99;
+        const string k_StyleSheetPath = "StyleSheets/LightingSearchColumnProviders.uss";
         const int k_MinBakingSamples = 1;
         const int k_MaxBakingSamples = 8192;
         static StyleSheet s_StyleSheet;
@@ -33,26 +32,6 @@ static StyleSheet LoadStyleSheet()
             return s_StyleSheet;
         }
 
-        [SearchSelector(k_VolumeModePath, provider: k_SceneProvider, priority: k_DefaultSearchSelectorPriority)]
-        static object VolumeModeSearchSelector(SearchSelectorArgs args)
-        {
-            var go = args.current.ToObject<GameObject>();
-            if (go == null)
-                return null;
-
-            return LightingSearchDataAccessors.GetVolumeMode(go);
-        }
-
-        [SearchSelector(k_VolumeProfilePath, provider: k_SceneProvider, priority: k_DefaultSearchSelectorPriority)]
-        static object VolumeProfileSearchSelector(SearchSelectorArgs args)
-        {
-            var go = args.current.ToObject<GameObject>();
-            if (go == null)
-                return null;
-
-            return LightingSearchDataAccessors.GetVolumeProfile(go);
-        }
-
         [SearchColumnProvider(k_BakingModePath)]
         public static void BakingModeSearchColumnProvider(SearchColumn column)
         {
@@ -396,7 +375,7 @@ internal static void SetLightShape(GameObject go, LightType value)
 
         internal static bool IsLightShapeApplicable(LightType lightType)
         {
-            return IsAreaLight(lightType);
+            return lightType is LightType.Rectangle or LightType.Disc;
         }
 
         static bool IsAreaLight(LightType lightType)
@@ -407,8 +386,7 @@ static bool IsAreaLight(LightType lightType)
         enum AreaLightShape
         {
             Rectangle = LightType.Rectangle,
-            Disc = LightType.Disc,
-            Tube = LightType.Tube
+            Disc = LightType.Disc
         }
 
         class LightShapeField : EnumField
@@ -452,7 +430,9 @@ void UpdateEnumField()
             {
                 if (IsAreaLight(m_Value))
                 {
-                    Init((AreaLightShape)m_Value, false);
+                    // Tube is not offered as an option; display as Rectangle
+                    var displayType = m_Value == LightType.Tube ? LightType.Rectangle : m_Value;
+                    Init((AreaLightShape)displayType, false);
                 }
             }
         }

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

@@ -241,11 +241,13 @@ public void Create(ProbeVolumeBakingSet bakingSet, LightingSettings lightingSett
                 skyOcclusionBakingSamples = bakingSet != null ? bakingSet.skyOcclusionBakingSamples : 0;
                 skyOcclusionBakingBounces = bakingSet != null ? bakingSet.skyOcclusionBakingBounces : 0;
 
-#if UNIFIED_BAKER
-                int indirectSampleCount = lightingSettings.indirectSampleCount;
-#else
-                int indirectSampleCount = Math.Max(lightingSettings.indirectSampleCount, lightingSettings.environmentSampleCount);
-#endif
+                var usingComputeLightBaker = UnityEditor.Rendering.EditorGraphicsSettings.defaultLightBaker == UnityEditor.Rendering.LightBaker.UnityComputeLightBaker;
+                int indirectSampleCount = 0;
+                if (usingComputeLightBaker)
+                    indirectSampleCount = lightingSettings.indirectSampleCount;
+                else
+                    indirectSampleCount = Math.Max(lightingSettings.indirectSampleCount, lightingSettings.environmentSampleCount);
+
                 Create(lightingSettings, ignoreEnvironement, lightingSettings.directSampleCount, indirectSampleCount, lightingSettings.environmentSampleCount,
                     (int)lightingSettings.lightProbeSampleCountMultiplier, lightingSettings.maxBounces);
             }
@@ -670,7 +672,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                     failed |= !layerMaskJob.Step();
 
                 // Bake probe SH
-                s_BakeData.InitLightingJob(m_BakingSet, uniquePositions, BakeType.ApvOnly);
+                s_BakeData.InitLightingJob(bakingSet, touchup, uniquePositions, BakeType.ApvOnly);
                 LightingBaker lightingJob = s_BakeData.lightingJob;
                 while (!failed && lightingJob.currentStep < lightingJob.stepCount)
                     failed |= !lightingJob.Step();
@@ -680,7 +682,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                 foreach ((int uniqueProbeIndex, int cellIndex, int i) in bakedProbes)
                 {
                     ref var cell = ref bakingCells[cellIndex];
-                    cell.SetBakedData(m_BakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
+                    cell.SetBakedData(bakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
                         lightingJob.irradiance[uniqueProbeIndex], lightingJob.validity[uniqueProbeIndex],
                         layerMaskJob.renderingLayerMasks, virtualOffsetJob.offsets,
                         skyOcclusionJob.occlusion, skyOcclusionJob.encodedDirections, lightingJob.occlusion);
@@ -696,8 +698,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                 {
                     // Validate baking cells size before any global state modifications
                     var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
-                    var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
-                    var hasRenderingLayers = m_BakingSet.useRenderingLayers;
+                    var hasVirtualOffsets = bakingSet.settings.virtualOffsetSettings.useVirtualOffset;
+                    var hasRenderingLayers = bakingSet.useRenderingLayers;
 
                     if (ValidateBakingCellsSize(bakingCells, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
                     {
@@ -707,8 +709,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
                             ComputeValidityMasks(cell);
                         }
 
-                        // Attempt to write the result to disk
-                        if (WriteBakingCells(bakingCells))
+                        // Attempt to write the result to disk.
+                        if (WriteBakingCells(bakingSet, bakingCells))
                         {
                             // Reload everything
                             AssetDatabase.SaveAssets();