[FIX] Temp Update on Material Assignment (#420)
* Temp Update on Material Assignment Previously it was shader assignment by request or iterative order from URP to Unlit, but LLM usually assign Standard in a URP setting. This small fix introduce the helper to resolve some of the conflicts, while give warnings in the log to show if the user is creating a shader in a non-compatible setting. * Update RenderPipelineUtility.csmain
Shutong Wu
GitHub
parent
84f7b855e8
commit
eb9327c06a
|
|
@ -0,0 +1,195 @@
|
|||
using System;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Rendering;
|
||||
|
||||
namespace MCPForUnity.Editor.Helpers
|
||||
{
|
||||
internal static class RenderPipelineUtility
|
||||
{
|
||||
internal enum PipelineKind
|
||||
{
|
||||
BuiltIn,
|
||||
Universal,
|
||||
HighDefinition,
|
||||
Custom
|
||||
}
|
||||
|
||||
private static readonly string[] BuiltInLitShaders = { "Standard", "Legacy Shaders/Diffuse" };
|
||||
private static readonly string[] BuiltInUnlitShaders = { "Unlit/Color", "Unlit/Texture" };
|
||||
private static readonly string[] UrpLitShaders = { "Universal Render Pipeline/Lit", "Universal Render Pipeline/Simple Lit" };
|
||||
private static readonly string[] UrpUnlitShaders = { "Universal Render Pipeline/Unlit" };
|
||||
private static readonly string[] HdrpLitShaders = { "HDRP/Lit", "High Definition Render Pipeline/Lit" };
|
||||
private static readonly string[] HdrpUnlitShaders = { "HDRP/Unlit", "High Definition Render Pipeline/Unlit" };
|
||||
|
||||
internal static PipelineKind GetActivePipeline()
|
||||
{
|
||||
var asset = GraphicsSettings.currentRenderPipeline;
|
||||
if (asset == null)
|
||||
{
|
||||
return PipelineKind.BuiltIn;
|
||||
}
|
||||
|
||||
var typeName = asset.GetType().FullName ?? string.Empty;
|
||||
if (typeName.IndexOf("HighDefinition", StringComparison.OrdinalIgnoreCase) >= 0 ||
|
||||
typeName.IndexOf("HDRP", StringComparison.OrdinalIgnoreCase) >= 0)
|
||||
{
|
||||
return PipelineKind.HighDefinition;
|
||||
}
|
||||
|
||||
if (typeName.IndexOf("Universal", StringComparison.OrdinalIgnoreCase) >= 0 ||
|
||||
typeName.IndexOf("URP", StringComparison.OrdinalIgnoreCase) >= 0)
|
||||
{
|
||||
return PipelineKind.Universal;
|
||||
}
|
||||
|
||||
return PipelineKind.Custom;
|
||||
}
|
||||
|
||||
internal static Shader ResolveShader(string requestedNameOrAlias)
|
||||
{
|
||||
var pipeline = GetActivePipeline();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(requestedNameOrAlias))
|
||||
{
|
||||
var alias = requestedNameOrAlias.Trim();
|
||||
var aliasMatch = ResolveAlias(alias, pipeline);
|
||||
if (aliasMatch != null)
|
||||
{
|
||||
WarnIfPipelineMismatch(aliasMatch.name, pipeline);
|
||||
return aliasMatch;
|
||||
}
|
||||
|
||||
var direct = Shader.Find(alias);
|
||||
if (direct != null)
|
||||
{
|
||||
WarnIfPipelineMismatch(direct.name, pipeline);
|
||||
return direct;
|
||||
}
|
||||
|
||||
McpLog.Warn($"Shader '{alias}' not found. Falling back to {pipeline} defaults.");
|
||||
}
|
||||
|
||||
var fallback = ResolveDefaultLitShader(pipeline)
|
||||
?? ResolveDefaultLitShader(PipelineKind.BuiltIn)
|
||||
?? Shader.Find("Unlit/Color");
|
||||
|
||||
if (fallback != null)
|
||||
{
|
||||
WarnIfPipelineMismatch(fallback.name, pipeline);
|
||||
}
|
||||
|
||||
return fallback;
|
||||
}
|
||||
|
||||
internal static Shader ResolveDefaultLitShader(PipelineKind pipeline)
|
||||
{
|
||||
return pipeline switch
|
||||
{
|
||||
PipelineKind.HighDefinition => TryFindShader(HdrpLitShaders) ?? TryFindShader(UrpLitShaders),
|
||||
PipelineKind.Universal => TryFindShader(UrpLitShaders) ?? TryFindShader(HdrpLitShaders),
|
||||
PipelineKind.Custom => TryFindShader(BuiltInLitShaders) ?? TryFindShader(UrpLitShaders) ?? TryFindShader(HdrpLitShaders),
|
||||
_ => TryFindShader(BuiltInLitShaders) ?? Shader.Find("Unlit/Color")
|
||||
};
|
||||
}
|
||||
|
||||
internal static Shader ResolveDefaultUnlitShader(PipelineKind pipeline)
|
||||
{
|
||||
return pipeline switch
|
||||
{
|
||||
PipelineKind.HighDefinition => TryFindShader(HdrpUnlitShaders) ?? TryFindShader(UrpUnlitShaders) ?? TryFindShader(BuiltInUnlitShaders),
|
||||
PipelineKind.Universal => TryFindShader(UrpUnlitShaders) ?? TryFindShader(HdrpUnlitShaders) ?? TryFindShader(BuiltInUnlitShaders),
|
||||
PipelineKind.Custom => TryFindShader(BuiltInUnlitShaders) ?? TryFindShader(UrpUnlitShaders) ?? TryFindShader(HdrpUnlitShaders),
|
||||
_ => TryFindShader(BuiltInUnlitShaders)
|
||||
};
|
||||
}
|
||||
|
||||
private static Shader ResolveAlias(string alias, PipelineKind pipeline)
|
||||
{
|
||||
if (string.Equals(alias, "lit", StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(alias, "default", StringComparison.OrdinalIgnoreCase) ||
|
||||
string.Equals(alias, "default_lit", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return ResolveDefaultLitShader(pipeline);
|
||||
}
|
||||
|
||||
if (string.Equals(alias, "unlit", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return ResolveDefaultUnlitShader(pipeline);
|
||||
}
|
||||
|
||||
if (string.Equals(alias, "urp_lit", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return TryFindShader(UrpLitShaders);
|
||||
}
|
||||
|
||||
if (string.Equals(alias, "hdrp_lit", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return TryFindShader(HdrpLitShaders);
|
||||
}
|
||||
|
||||
if (string.Equals(alias, "built_in_lit", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return TryFindShader(BuiltInLitShaders);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Shader TryFindShader(params string[] shaderNames)
|
||||
{
|
||||
foreach (var shaderName in shaderNames)
|
||||
{
|
||||
var shader = Shader.Find(shaderName);
|
||||
if (shader != null)
|
||||
{
|
||||
return shader;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static void WarnIfPipelineMismatch(string shaderName, PipelineKind activePipeline)
|
||||
{
|
||||
if (string.IsNullOrEmpty(shaderName))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var lowerName = shaderName.ToLowerInvariant();
|
||||
bool shaderLooksUrp = lowerName.Contains("universal render pipeline") || lowerName.Contains("urp/");
|
||||
bool shaderLooksHdrp = lowerName.Contains("high definition render pipeline") || lowerName.Contains("hdrp/");
|
||||
bool shaderLooksBuiltin = lowerName.Contains("standard") || lowerName.Contains("legacy shaders/");
|
||||
bool shaderLooksSrp = shaderLooksUrp || shaderLooksHdrp;
|
||||
|
||||
switch (activePipeline)
|
||||
{
|
||||
case PipelineKind.HighDefinition:
|
||||
if (shaderLooksUrp)
|
||||
{
|
||||
McpLog.Warn($"[RenderPipelineUtility] Active pipeline is HDRP but shader '{shaderName}' looks URP-based. Asset may appear incorrect.");
|
||||
}
|
||||
else if (shaderLooksBuiltin && !shaderLooksHdrp)
|
||||
{
|
||||
McpLog.Warn($"[RenderPipelineUtility] Active pipeline is HDRP but shader '{shaderName}' looks Built-in. Consider using an HDRP shader for correct results.");
|
||||
}
|
||||
break;
|
||||
case PipelineKind.Universal:
|
||||
if (shaderLooksHdrp)
|
||||
{
|
||||
McpLog.Warn($"[RenderPipelineUtility] Active pipeline is URP but shader '{shaderName}' looks HDRP-based. Asset may appear incorrect.");
|
||||
}
|
||||
else if (shaderLooksBuiltin && !shaderLooksUrp)
|
||||
{
|
||||
McpLog.Warn($"[RenderPipelineUtility] Active pipeline is URP but shader '{shaderName}' looks Built-in. Consider using a URP shader for correct results.");
|
||||
}
|
||||
break;
|
||||
case PipelineKind.BuiltIn:
|
||||
if (shaderLooksSrp)
|
||||
{
|
||||
McpLog.Warn($"[RenderPipelineUtility] Active pipeline is Built-in but shader '{shaderName}' targets URP/HDRP. Asset may not render as expected.");
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5a0a1cfd55ab4bc99c74c52854f6bdf3
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -196,20 +196,26 @@ namespace MCPForUnity.Editor.Tools
|
|||
}
|
||||
else if (lowerAssetType == "material")
|
||||
{
|
||||
// Prefer provided shader; fall back to common pipelines
|
||||
var requested = properties?["shader"]?.ToString();
|
||||
Shader shader =
|
||||
(!string.IsNullOrEmpty(requested) ? Shader.Find(requested) : null)
|
||||
?? Shader.Find("Universal Render Pipeline/Lit")
|
||||
?? Shader.Find("HDRP/Lit")
|
||||
?? Shader.Find("Standard")
|
||||
?? Shader.Find("Unlit/Color");
|
||||
Shader shader = RenderPipelineUtility.ResolveShader(requested);
|
||||
if (shader == null)
|
||||
return new ErrorResponse($"Could not find a suitable shader (requested: '{requested ?? "none"}').");
|
||||
return new ErrorResponse($"Could not find a project-compatible shader (requested: '{requested ?? "none"}'). Consider installing URP/HDRP or provide an explicit shader path.");
|
||||
|
||||
var mat = new Material(shader);
|
||||
if (properties != null)
|
||||
ApplyMaterialProperties(mat, properties);
|
||||
{
|
||||
JObject propertiesForApply = properties;
|
||||
if (propertiesForApply["shader"] != null)
|
||||
{
|
||||
propertiesForApply = (JObject)properties.DeepClone();
|
||||
propertiesForApply.Remove("shader");
|
||||
}
|
||||
|
||||
if (propertiesForApply.HasValues)
|
||||
{
|
||||
ApplyMaterialProperties(mat, propertiesForApply);
|
||||
}
|
||||
}
|
||||
AssetDatabase.CreateAsset(mat, fullPath);
|
||||
newAsset = mat;
|
||||
}
|
||||
|
|
@ -901,7 +907,8 @@ namespace MCPForUnity.Editor.Tools
|
|||
// Example: Set shader
|
||||
if (properties["shader"]?.Type == JTokenType.String)
|
||||
{
|
||||
Shader newShader = Shader.Find(properties["shader"].ToString());
|
||||
string shaderRequest = properties["shader"].ToString();
|
||||
Shader newShader = RenderPipelineUtility.ResolveShader(shaderRequest);
|
||||
if (newShader != null && mat.shader != newShader)
|
||||
{
|
||||
mat.shader = newShader;
|
||||
|
|
|
|||
Loading…
Reference in New Issue