[Render Pipeline converter]Settings Converter - Fix URP asset generation with their renderers

Author: alex-vazquez-unity3d

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

@@ -19,9 +19,11 @@ class Styles
 
         public void PreferenceGUI()
         {
+            EditorGUI.indentLevel++;
             AdvancedProperties.enabled = EditorGUILayout.IntPopup(Styles.additionalPropertiesLabel,
                 AdvancedProperties.enabled ? 1 : 0, Styles.additionalPropertiesNames,
                 Styles.additionalPropertiesValues) == 1;
+            EditorGUI.indentLevel--;
         }
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Volume/VolumesPreferences.cs

@@ -87,12 +87,14 @@ public static VolumeGizmoVisibility volumeGizmosVisibilityOption
         /// </summary>
         public void PreferenceGUI()
         {
+            EditorGUI.indentLevel++;
             EditorGUI.BeginChangeCheck();
             var newValue = EditorGUILayout.EnumPopup(Styles.volumeGizmosVisibilityLabel, volumeGizmosVisibilityOption);
             if (EditorGUI.EndChangeCheck())
             {
                 volumeGizmosVisibilityOption = (VolumeGizmoVisibility)newValue;
             }
+            EditorGUI.indentLevel--;
         }
     }
 }

Packages/com.unity.render-pipelines.core/Runtime/Utilities/CoreUtils.cs

@@ -7,6 +7,7 @@
 
 namespace UnityEngine.Rendering
 {
+    using static UnityEngine.Rendering.HableCurve;
     using UnityObject = UnityEngine.Object;
 
     /// <summary>
@@ -1845,6 +1846,7 @@ public static void EnsureFolderTreeInAssetFilePath(string filePath)
             var path = filePath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar);
             if (!path.StartsWith("Assets" + Path.DirectorySeparatorChar, StringComparison.CurrentCultureIgnoreCase))
                 throw new ArgumentException($"Path should start with \"Assets/\". Got {filePath}.", filePath);
+
             var folderPath = Path.GetDirectoryName(path);
 
             if (!UnityEditor.AssetDatabase.IsValidFolder(folderPath))

Packages/com.unity.render-pipelines.core/Tests/Editor/CoreUtils.Tests.EnsureFolderTreeInAssetFilePath.cs

@@ -1,31 +1,41 @@
-using System;
+using System;
 using System.IO;
 using NUnit.Framework;
 using UnityEngine.Rendering;
 
 namespace UnityEditor.Rendering.Tests
 {
+    [Category("Utilities")]
     partial class CoreUtilsTests
     {
         [Test]
-        [TestCase("Assets/TestFolder/")]
-        [TestCase("Assets/TestFolder\\")]
-        [TestCase("Assets/TestFolder/123/Folder/")]
-        [TestCase("Assets/TestFolder\\123\\Folder\\")]
-        [TestCase("Assets/TestFolder/something.mat")]
-        [TestCase("Assets/TestFolder\\something.mat")]
+        [TestCase("Assets/", TestName = "Root Assets folder with trailing slash")]
+        [TestCase("Assets/TestFolder/Folder/", TestName = "Simple folder path with trailing slash")]
+        [TestCase("Assets/TestFolder\\Folder\\", TestName = "Simple folder path with backslash")]
+        [TestCase("Assets/TestFolder/123/Folder/", TestName = "Numeric folder name inside path")]
+        [TestCase("Assets/TestFolder\\123\\Folder\\", TestName = "Numeric folder name with backslashes")]
+        [TestCase("Assets/TestFolder/something.mat", TestName = "Valid file with extension")]
+        [TestCase("Assets/TestFolder\\something.mat", TestName = "Valid file with extension and backslashes")]
+        [TestCase("Assets/TestFolder/Folder-With-Dashes/", TestName = "Folder name containing dashes")]
+        [TestCase("Assets/TestFolder/Folder With Spaces/", TestName = "Folder name containing spaces")]
+        [TestCase("Assets/TestFolder/Folder_123/SubFolder/", TestName = "Folder name with underscore and numbers")]
+        [TestCase("Assets/TestFolder/Folder.Special/", TestName = "Folder name containing a dot")]
+        [TestCase("Assets/TestFolder/Folder#Test/SubFolder/", TestName = "Folder name containing a hash character")]
+        [TestCase("Assets/TestFolder/Folder@Test/SubFolder/File.txt", TestName = "File name containing @ character")]
+        [TestCase("Assets/TestFolder/Folder\\SubFolder/File", TestName = "File without extension")]
+
         public void EnsureFolderTreeInAssetFilePath(string path)
         {
             string folderPath = Path.GetDirectoryName(path);
             CoreUtils.EnsureFolderTreeInAssetFilePath(path);
-            Assert.True(AssetDatabase.IsValidFolder(folderPath));
+            Assert.True(AssetDatabase.IsValidFolder(folderPath), $"Folder '{folderPath}' should exist.");
         }
 
         [Test]
-        [TestCase("NotAssetsFolder/TestFolder/", TestName = "EnsureFolderTreeInAssetFilePath throws when filePath does not start with Assets/")]
+        [TestCase("Assets", TestName = "Just Assets and not Assets/")]
+        [TestCase("NotAssetsFolder/TestFolder/", TestName = "FilePath does not start with Assets/")]
         public void EnsureFolderTreeInAssetFilePathThrows(string folderPath)
         {
-            Assert.False(AssetDatabase.IsValidFolder(folderPath));
             Assert.Throws<ArgumentException>(() => CoreUtils.EnsureFolderTreeInAssetFilePath(folderPath));
         }
 

Packages/com.unity.render-pipelines.high-definition/Editor/Core/HDRenderPipelinePreferencesProvider.cs

@@ -41,9 +41,8 @@ class Styles
 
             public static readonly GUIContent hdrpProjectSettingsPathLabel = EditorGUIUtility.TrTextContent("Resources Folder Name", "Resources Folder will be the one where to get project elements related to HDRP as default scene and default settings.");
 
-            public static readonly GUIContent matcapLabel = EditorGUIUtility.TrTextContent("MatCap Mode Default Values");
-            public static readonly GUIContent matcapViewMixAlbedoLabel = EditorGUIUtility.TrTextContent("Mix Albedo", "Enable to make HDRP mix the albedo of the Material with its material capture.");
-            public static readonly GUIContent matcapViewScaleLabel = EditorGUIUtility.TrTextContent("Intensity Scale", "Set the intensity of the material capture. This increases the brightness of the Scene. This is useful if the albedo darkens the Scene considerably.");
+            public static readonly GUIContent matcapViewMixAlbedoLabel = EditorGUIUtility.TrTextContent("MatCap Mode Mix Albedo", "Enable to make HDRP mix the albedo of the Material with its material capture.");
+            public static readonly GUIContent matcapViewScaleLabel = EditorGUIUtility.TrTextContent("MatCap Mode Intensity Scale", "Set the intensity of the material capture. This increases the brightness of the Scene. This is useful if the albedo darkens the Scene considerably.");
         }
 
         static List<string> s_SearchKeywords = new() {
@@ -64,20 +63,19 @@ class Styles
         /// </summary>
         public void PreferenceGUI()
         {
+            EditorGUI.indentLevel++;
             HDProjectSettings.projectSettingsFolderPath = EditorGUILayout.TextField(Styles.hdrpProjectSettingsPathLabel, HDProjectSettings.projectSettingsFolderPath);
             DrawConfigPackageDropdown();
             DrawMatCapDefaults();
+            EditorGUI.indentLevel--;
         }
 
         void DrawMatCapDefaults()
         {
-            EditorGUILayout.LabelField(Styles.matcapLabel, EditorStyles.boldLabel);
-            EditorGUI.indentLevel++;
             var matCapMode = HDRenderPipelinePreferences.matCapMode;
             matCapMode.mixAlbedo.value = EditorGUILayout.Toggle(Styles.matcapViewMixAlbedoLabel, matCapMode.mixAlbedo.value);
             if (matCapMode.mixAlbedo.value)
                 matCapMode.viewScale.value = EditorGUILayout.FloatField(Styles.matcapViewScaleLabel, matCapMode.viewScale.value);
-            EditorGUI.indentLevel--;
         }
 
         private const string k_PackageName = "com.unity.render-pipelines.high-definition-config";