fix: update material conversion logic

Author: joaoborks

Packages/com.mygamedevtools.scene-loader/Samples/LoadingSceneExamples/Scripts/Editor/MaterialPipelineConverter.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 using UnityEditor;
 using System.Collections.Generic;
+using System.Linq;
 #if CONVERT_MATERIALS
 using UnityEditor.Rendering;
 using UnityEngine.Rendering;
@@ -14,53 +15,66 @@
 #endif
 #endif
 
+[InitializeOnLoad]
 public static class MaterialPipelineConverter
 {
-    const string _partialPath = "LoadingSceneExamples/Materials";
+    const string _partialPath = "Loading Scene Examples/Materials";
+
+    static MaterialPipelineConverter()
+    {
+        EditorApplication.delayCall += ConvertMaterials;
+    }
 
     public static void ConvertMaterials()
     {
+        RenderPipelineAsset renderPipeline = GraphicsSettings.currentRenderPipeline;
+        if (!renderPipeline)
+            return;
+
 #if CONVERT_MATERIALS
-        string fullPath = FindFolderByPartialPath(_partialPath);
-        if (string.IsNullOrEmpty(fullPath))
+        string[] materialPaths = AssetDatabase.FindAssets("t:Material")
+            .Select(AssetDatabase.GUIDToAssetPath)
+            .Where(path => path.Contains(_partialPath))
+            .ToArray();
+
+        if (materialPaths.Length == 0)
+            return;
+
+        Material[] materials = materialPaths
+            .Select(path => AssetDatabase.LoadAssetAtPath<Material>(path))
+            .Where(material => material != null && material.shader.name == "Standard")
+            .ToArray();
+
+        if (materials.Length == 0)
             return;
 
-        List<MaterialUpgrader> upgraders = GetMaterialUpgraders();
-        if (upgraders.Count > 0)
+        List<MaterialUpgrader> upgraders = GetMaterialUpgraders(renderPipeline);
+        if (upgraders.Count > 0 && EditorUtility.DisplayDialog("Sample Material Upgrader", "The sample materials have to be upgraded to match your render pipeline. Would you like to upgrade them now?", "Upgrade", "Ignore"))
         {
-            MaterialUpgrader.UpgradeProjectFolder(GetMaterialUpgraders(), fullPath);
+            foreach (Material material in materials)
+            {
+                MaterialUpgrader.Upgrade(material, upgraders, MaterialUpgrader.UpgradeFlags.None);
+            }
             AssetDatabase.Refresh();
         }
 #endif
     }
 
 #if CONVERT_MATERIALS
-    static List<MaterialUpgrader> GetMaterialUpgraders()
+    static List<MaterialUpgrader> GetMaterialUpgraders(RenderPipelineAsset renderPipeline)
     {
-        RenderPipelineAsset renderPipeline = GraphicsSettings.currentRenderPipeline;
         List<MaterialUpgrader> upgraders = new();
-#if CONVERT_HDRP
-        if (renderPipeline is HDRenderPipelineAsset)
-            upgraders.Add(new StandardsToHDLitMaterialUpgrader("Standard", "HDRP/Lit"));
-#endif
 #if CONVERT_URP
         if (renderPipeline is UniversalRenderPipelineAsset)
             upgraders.Add(new StandardUpgrader("Standard"));
+#endif
+#if CONVERT_HDRP
+        if (renderPipeline is HDRenderPipelineAsset)
+            upgraders.Add(new StandardsToHDLitMaterialUpgrader("Standard", "HDRP/Lit"));
 #endif
         return upgraders;
     }
 #endif
-
-    static string FindFolderByPartialPath(string partialPath)
-    {
-        string[] allFolders = AssetDatabase.GetAllAssetPaths();
-        foreach (string folder in allFolders)
-        {
-            if (folder.EndsWith(partialPath))
-                return folder;
-        }
-        return null;
-    }
 }
 
 #if CONVERT_HDRP

Packages/com.mygamedevtools.scene-loader/Samples/LoadingSceneExamples/Scripts/Editor/SceneBuildSettingsEditor.cs

@@ -22,7 +22,6 @@ public static class SceneBuildSettingsEditor
     static SceneBuildSettingsEditor()
     {
         EditorApplication.delayCall += CheckScenesInBuildSettings;
-        EditorApplication.delayCall += MaterialPipelineConverter.ConvertMaterials;
     }
 
     static void CheckScenesInBuildSettings()

Packages/com.mygamedevtools.scene-loader/package.json

@@ -2,7 +2,7 @@
   "name": "com.mygamedevtools.scene-loader",
   "version": "3.1.0",
   "displayName": "Advanced Scene Manager",
-  "description": "This package simplifies scene operations: load, unload and transition. In a quick example:\n\n\u2590 // Unity Manager scene transition\n\u2590 yield return SceneManager.LoadSceneAsync(\"my-loading-scene\",\n\u2590        LoadSceneMode.Additive);\n\u2590 yield return SceneManager.LoadSceneAsync(\"my-target-scene\",\n\u2590        LoadSceneMode.Additive);\n\u2590\n\u2590 SceneManager.SetActiveScene(\n\u2590        SceneManager.GetSceneByName(\"my-target-scene\"));\n\u2590\n\u2590 SceneManager.UnloadSceneAsync(\"my-loading-scene\");\n\u2590 SceneManager.UnloadSceneAsync(\"my-previous-scene\");\n\u2590\n\u2590 // Advanced Scene Manager scene transition\n\u2590 AdvancedSceneManager.TransitionAsync(\"my-target-scene\", \"my-loading-scene\");\n\nYou can also take advantage of these features:\n\n\u25aa Unified API for addressable and non-addressable scenes.\n\u25aa Awaitable scene operations.\n\u25aa Modular implementation with interfaces.\n\u25aa Load, unload or transition to multiple scenes.",
+  "description": "This package simplifies scene operations: load, unload and transition.\nFor example, this is how you perform a scene transition:\n\n\u2503AdvancedSceneManager.TransitionAsync(\"my-target-scene\", \"my-loading-scene\");\n\nInstead of:\n\n\u2503 yield return SceneManager.LoadSceneAsync(\"my-loading-scene\",\n\u2503        LoadSceneMode.Additive);\n\u2503 yield return SceneManager.LoadSceneAsync(\"my-target-scene\",\n\u2503        LoadSceneMode.Additive);\n\u2503\n\u2503 SceneManager.SetActiveScene(\n\u2503        SceneManager.GetSceneByName(\"my-target-scene\"));\n\u2503\n\u2503 SceneManager.UnloadSceneAsync(\"my-loading-scene\");\n\u2503 SceneManager.UnloadSceneAsync(\"my-previous-scene\");\n\nYou can also take advantage of these features:\n\n\u25aa Unified API for addressable and non-addressable scenes.\n\u25aa Awaitable scene operations.\n\u25aa Modular implementation with interfaces.\n\u25aa Load, unload or transition to multiple scenes.",
   "unity": "2021.3",
   "keywords": [],
   "author": {