Fix Select Material Button, and Add CustomMaterialAssetFinder Sample

JasonMa0012 · Nov 29, 2024 · 92338d4 · 92338d4
1 parent 87aad57
commit 92338d4
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 7 deletions.
diff --git a/Editor/CustomGUISample/CustomFooter.cs b/Editor/CustomGUISample/CustomFooter.cs
@@ -15,7 +15,8 @@ public static void DoCustomFooter(LWGUI lwgui)
 		[InitializeOnLoadMethod]
 		private static void RegisterEvent()
 		{
-			LWGUI.onDrawCustomFooter += DoCustomFooter;
+			// Register Event
+			// LWGUI.onDrawCustomFooter += DoCustomFooter;
 		}
 	}
 }
diff --git a/Editor/CustomGUISample/CustomHeader.cs b/Editor/CustomGUISample/CustomHeader.cs
@@ -15,7 +15,8 @@ public static void DoCustomHeader(LWGUI lwgui)
 		[InitializeOnLoadMethod]
 		private static void RegisterEvent()
 		{
-			LWGUI.onDrawCustomHeader += DoCustomHeader;
+			// Register Event
+			// LWGUI.onDrawCustomHeader += DoCustomHeader;
 		}
 	}
 }
diff --git a/Editor/CustomGUISample/CustomMaterialAssetFinder.cs b/Editor/CustomGUISample/CustomMaterialAssetFinder.cs
@@ -0,0 +1,48 @@
+using System.Linq;
+using UnityEngine;
+using UnityEditor;
+
+namespace LWGUI
+{
+	public static class CustomMaterialAssetFinder
+	{
+		public static Material FindMaterialAssetInRendererByMaterialInstance(Renderer renderer, Material materialInstance)
+		{
+			Material materialAsset = null;
+
+			// Find the material asset by name
+			// if (materialAsset == null)
+			// {
+			// 	var name = materialInstance.name.Replace(" (Instance)", "");
+			// 	var guids = AssetDatabase.FindAssets("t:Material " + name, new[] { "Assets" }).Select(guid =>
+			// 	{
+			// 		var assetPath = AssetDatabase.GUIDToAssetPath(guid);
+			// 		if (string.IsNullOrEmpty(assetPath) || !assetPath.EndsWith(".mat"))
+			// 			return null;
+			// 		else
+			// 			return guid;
+			// 	}).ToArray();
+			//
+			// 	if (guids != null && guids.Length > 0)
+			// 	{
+			// 		var matPath = AssetDatabase.GUIDToAssetPath(guids[0]);
+			// 		Selection.activeObject = AssetDatabase.LoadAssetAtPath<Material>(matPath);
+			// 		
+			// 		if (guids.Length > 1)
+			// 		{
+			// 			Debug.LogWarning($"LWGUI: Multiple materials with the same name were found, and the first one was selected: { matPath }");
+			// 		}
+			// 	}
+			// }
+
+			return materialAsset;
+		}
+
+		[InitializeOnLoadMethod]
+		private static void RegisterEvent()
+		{
+			// Register Event
+			// Helper.onFindMaterialAssetInRendererByMaterialInstance = FindMaterialAssetInRendererByMaterialInstance;
+		}
+	}
+}
diff --git a/Editor/CustomGUISample/CustomMaterialAssetFinder.cs.meta b/Editor/CustomGUISample/CustomMaterialAssetFinder.cs.meta
diff --git a/Editor/Helper/Helper.cs b/Editor/Helper/Helper.cs
@@ -629,7 +629,7 @@ void OnSwitchDisplayMode(object data, string[] options, int selectedIndex)
 			toolBarRect.xMin += 2;
 		}
 
-		public static Func<MeshRenderer, Material, Material> onFindMaterialAssetInRendererByMaterialInstance;
+		public static Func<Renderer, Material, Material> onFindMaterialAssetInRendererByMaterialInstance;
 
 		private static bool FindMaterialAssetByMaterialInstance(Material material, LWGUIMetaDatas metaDatas, out Material materialAsset)
 		{

diff --git a/UnityEditorExtension/ReflectionHelper.cs b/UnityEditorExtension/ReflectionHelper.cs
@@ -51,9 +51,9 @@ public static void DefaultShaderPropertyInternal(this MaterialEditor editor, Rec
             editor.DefaultShaderPropertyInternal(position, prop, label);
         }
 
-        public static List<MeshRenderer> GetMeshRenderersByMaterialEditor(this MaterialEditor materialEditor)
+        public static List<Renderer> GetMeshRenderersByMaterialEditor(this MaterialEditor materialEditor)
         {
-            var outRenderers = new List<MeshRenderer>();
+            var outRenderers = new List<Renderer>();
 
             // MaterialEditor.ShouldEditorBeHidden()
             PropertyEditor property = materialEditor.propertyViewer as PropertyEditor;
@@ -63,6 +63,7 @@ public static List<MeshRenderer> GetMeshRenderersByMaterialEditor(this MaterialE
                 if (gameObject)
                 {
                     outRenderers.AddRange(gameObject.GetComponents<MeshRenderer>());
+                    outRenderers.AddRange(gameObject.GetComponents<SkinnedMeshRenderer>());
                 }
             }
 

diff --git a/UnityEditorExtension/UnityEditorExtension.cs b/UnityEditorExtension/UnityEditorExtension.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Jason Ma
+// Copyright (c) Jason Ma
 
 using UnityEditor;
 using UnityEngine;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.jasonma.lwgui",
-  "version": "1.20.1",
+  "version": "1.20.2",
   "displayName": "LWGUI",
   "description": "A Lightweight, Flexible, Powerful Shader GUI System for Unity.",
   "keywords": [