Fix ManageMaterial shader reflection for Unity 6 and improve texture logging

dsarno · dsarno · commit fe685c2b1790 · 2025-12-07T19:36:40.000-08:00
diff --git a/MCPForUnity/Editor/Helpers/MaterialOps.cs b/MCPForUnity/Editor/Helpers/MaterialOps.cs
@@ -310,7 +310,10 @@ public static bool TrySetShaderProperty(Material material, string propertyName,
                          }
                     }
                 }
-                catch { }
+                catch (Exception ex)
+                {
+                    McpLog.Warn($"SetTexture (string path) for '{propertyName}' failed: {ex.Message}");
+                }
             }
             
             if (value.Type == JTokenType.Object)
@@ -324,7 +327,10 @@ public static bool TrySetShaderProperty(Material material, string propertyName,
                         return true;
                     }
                 }
-                catch { }
+                catch (Exception ex)
+                {
+                    McpLog.Warn($"SetTexture (object) for '{propertyName}' failed: {ex.Message}");
+                }
             }
 
             Debug.LogWarning(
diff --git a/MCPForUnity/Editor/Tools/ManageMaterial.cs b/MCPForUnity/Editor/Tools/ManageMaterial.cs
@@ -361,9 +361,56 @@ private static object GetMaterialInfo(JObject @params)
             }
             
             Shader shader = mat.shader;
-            int propertyCount = ShaderUtil.GetPropertyCount(shader);
             var properties = new List<object>();
-            
+
+#if UNITY_6000_0_OR_NEWER
+            int propertyCount = shader.GetPropertyCount();
+            for (int i = 0; i < propertyCount; i++)
+            {
+                string name = shader.GetPropertyName(i);
+                var type = shader.GetPropertyType(i);
+                string description = shader.GetPropertyDescription(i);
+
+                object currentValue = null;
+                try
+                {
+                    if (mat.HasProperty(name))
+                    {
+                        switch (type)
+                        {
+                            case UnityEngine.Rendering.ShaderPropertyType.Color:
+                                var c = mat.GetColor(name);
+                                currentValue = new { r = c.r, g = c.g, b = c.b, a = c.a };
+                                break;
+                            case UnityEngine.Rendering.ShaderPropertyType.Vector:
+                                var v = mat.GetVector(name);
+                                currentValue = new { x = v.x, y = v.y, z = v.z, w = v.w };
+                                break;
+                            case UnityEngine.Rendering.ShaderPropertyType.Float:
+                            case UnityEngine.Rendering.ShaderPropertyType.Range:
+                                currentValue = mat.GetFloat(name);
+                                break;
+                            case UnityEngine.Rendering.ShaderPropertyType.Texture:
+                                currentValue = mat.GetTexture(name)?.name ?? "null";
+                                break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    currentValue = $"<error: {ex.Message}>";
+                }
+
+                properties.Add(new
+                {
+                    name = name,
+                    type = type.ToString(),
+                    description = description,
+                    value = currentValue
+                });
+            }
+#else
+            int propertyCount = ShaderUtil.GetPropertyCount(shader);
             for (int i = 0; i < propertyCount; i++)
             {
                 string name = ShaderUtil.GetPropertyName(shader, i);
@@ -399,6 +446,7 @@ private static object GetMaterialInfo(JObject @params)
                     value = currentValue
                 });
             }
+#endif
 
             return new {
                 status = "success",

Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,10 @@ public static bool TrySetShaderProperty(Material material, string propertyName,`
`310`	`310`	`}`
`311`	`311`	`}`
`312`	`312`	`}`
`313`		`- catch { }`
	`313`	`+ catch (Exception ex)`
	`314`	`+ {`
	`315`	`+ McpLog.Warn($"SetTexture (string path) for '{propertyName}' failed: {ex.Message}");`
	`316`	`+ }`
`314`	`317`	`}`
`315`	`318`
`316`	`319`	`if (value.Type == JTokenType.Object)`
`@@ -324,7 +327,10 @@ public static bool TrySetShaderProperty(Material material, string propertyName,`
`324`	`327`	`return true;`
`325`	`328`	`}`
`326`	`329`	`}`
`327`		`- catch { }`
	`330`	`+ catch (Exception ex)`
	`331`	`+ {`
	`332`	`+ McpLog.Warn($"SetTexture (object) for '{propertyName}' failed: {ex.Message}");`
	`333`	`+ }`
`328`	`334`	`}`
`329`	`335`
`330`	`336`	`Debug.LogWarning(`