Merge branch 'head_unity2019'

whiteflare · Jun 14, 2022 · 3bc2469 · 3bc2469
2 parents c69c64a + 9e5a777
commit 3bc2469
Show file tree

Hide file tree

Showing 116 changed files with 3,292 additions and 2,022 deletions.
diff --git a/Editor/WFEditorSetting.cs b/Editor/WFEditorSetting.cs
@@ -34,6 +34,7 @@ public class WFEditorSetting : ScriptableObject
         public bool stripFallback = true;
         public bool stripMetaPass = true;
         public bool stripUnusedLodFade = true;
+        public bool validateSceneMaterials = true;
 
         [Header("Editor Behaviour Settings")]
         public bool enableScanProjects = true;
@@ -78,6 +79,7 @@ public class WFEditorSettingEditor : Editor
         SerializedProperty p_stripFallback;
         SerializedProperty p_stripMetaPass;
         SerializedProperty p_stripUnusedLodFade;
+        SerializedProperty p_validateSceneMaterials;
         SerializedProperty p_enableScanProjects;
 
         private void OnEnable()
@@ -88,6 +90,7 @@ private void OnEnable()
             this.p_stripUnusedLodFade = serializedObject.FindProperty(nameof(WFEditorSetting.stripUnusedLodFade));
             this.p_stripFallback = serializedObject.FindProperty(nameof(WFEditorSetting.stripFallback));
             this.p_stripMetaPass = serializedObject.FindProperty(nameof(WFEditorSetting.stripMetaPass));
+            this.p_validateSceneMaterials = serializedObject.FindProperty(nameof(WFEditorSetting.validateSceneMaterials));
             this.p_enableScanProjects = serializedObject.FindProperty(nameof(WFEditorSetting.enableScanProjects));
         }
 
@@ -111,6 +114,7 @@ public override void OnInspectorGUI()
                 EditorGUILayout.PropertyField(p_stripFallback);
                 EditorGUILayout.PropertyField(p_stripMetaPass);
             }
+            EditorGUILayout.PropertyField(p_validateSceneMaterials);
 
             // Editor Behaviour Settings
 

diff --git a/Editor/WFEditorSettings.asset b/Editor/WFEditorSettings.asset
@@ -17,5 +17,6 @@ MonoBehaviour:
   stripUnusedVariant: 1
   stripFallback: 1
   stripMetaPass: 1
-  stripLodCrossFade: 1
+  stripUnusedLodFade: 1
+  validateSceneMaterials: 1
   enableScanProjects: 1
diff --git a/Editor/WFMaterialTemplate.cs b/Editor/WFMaterialTemplate.cs
@@ -83,7 +83,7 @@ public void ApplyToMaterial(IEnumerable<Material> mats)
                 if (mat.shader != material.shader)
                 {
                     mat.shader = material.shader;
-                    mat.renderQueue = material.renderQueue;
+                    mat.renderQueue = WFCommonUtility.GetMaterialRenderQueueValue(material);
                 }
             }
 

diff --git a/Editor/WF_AutoMigrationPostprocessor.cs b/Editor/WF_AutoMigrationPostprocessor.cs
@@ -17,6 +17,7 @@
 
 #if UNITY_EDITOR
 
+using System.Linq;
 using UnityEditor;
 
 namespace UnlitWF
@@ -25,14 +26,13 @@ public class WF_AutoMigrationPostprocessor : AssetPostprocessor
     {
         static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromPath)
         {
-            ScanAndMigrationExecutor.Migration(importedAssets);
-        }
-
-        [InitializeOnLoadMethod]
-        public static void ExecuteAuto()
-        {
-            ScanAndMigrationExecutor.ExecuteAuto();
-
+            // マテリアルのマイグレーション
+            Converter.ScanAndMigrationExecutor.Migration(importedAssets);
+            // もしshaderファイルがimportされたなら、そのタイミングで全スキャンも動作させる
+            if (importedAssets.Any(path => path != null && path.EndsWith(".shader", System.StringComparison.InvariantCultureIgnoreCase)))
+            {
+                Converter.ScanAndMigrationExecutor.ExecuteAuto();
+            }
         }
     }
 }

diff --git a/Editor/WF_Common.cs b/Editor/WF_Common.cs
@@ -330,6 +330,11 @@ public static bool IsMobileSupportedShader(Material mat)
             return mat != null && IsMobileSupportedShader(mat.shader);
         }
 
+        public static bool IsMigrationRequiredMaterial(Material mat)
+        {
+            return mat != null && Converter.WFMaterialMigrationConverter.ExistsNeedsMigration(mat);
+        }
+
         /// <summary>
         /// 最新リリースのVersionInfo
         /// </summary>
@@ -460,6 +465,19 @@ public static string GetShaderFallBackTarget(Material mat)
         {
             return mat == null ? null : GetShaderFallBackTarget(mat.shader);
         }
+
+        public static int GetMaterialRenderQueueValue(Material mat)
+        {
+            // Material.renderQueue の値を単に参照すると -1 (FromShader) が取れないので SerializedObject から取得する
+            var so = new SerializedObject(mat);
+            so.Update();
+            var prop = so.FindProperty("m_CustomRenderQueue");
+            if (prop != null)
+            {
+                return prop.intValue;
+            }
+            return mat.renderQueue;
+        }
     }
 
     public abstract class WFCustomKeywordSetting