feat: support for shaders with (SoftMaskable) in the name except at…

… the end
mob-sakai · Aug 10, 2024 · cd25357 · cd25357
1 parent f94c5f2
commit cd25357
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Editor/AssetModification/SoftMaskableShaderModifier.cs b/Editor/AssetModification/SoftMaskableShaderModifier.cs
@@ -11,7 +11,7 @@ internal class SoftMaskableShaderModifier : TextAssetModifier
  public static Modifier Create(string path)
  {
  var shader = AssetDatabase.LoadAssetAtPath<Shader>(path);
- if (!shader || !shader.name.Contains(" (SoftMaskable)")) return null;
+ if (!shader || !shader.name.Contains("(SoftMaskable)")) return null;
 
  return new SoftMaskableShaderModifier
  {

diff --git a/Editor/ShaderPreProcessor.cs b/Editor/ShaderPreProcessor.cs
@@ -20,7 +20,7 @@ public override void OnProcessShader(Shader shader, ShaderSnippetData snippet,
  IList<ShaderCompilerData> data)
  {
  // If the shader is not SoftMask/SoftMaskable, do nothing.
- if (shader.name != "Hidden/UI/SoftMask" && !shader.name.EndsWith(" (SoftMaskable)")) return;
+ if (shader.name != "Hidden/UI/SoftMask" && !shader.name.Contains("(SoftMaskable)")) return;
 
  // Remove the 'SOFTMASK_EDITOR' shader variants.
  var editor = new ShaderKeyword(shader, "SOFTMASK_EDITOR");

diff --git a/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs b/Runtime/ProjectSettings/UISoftMaskProjectSettings.cs
@@ -194,7 +194,7 @@ internal static bool CanIncludeShader(Shader shader)
  if (!shader) return false;
 
  var name = shader.name;
- return name.EndsWith(" (SoftMaskable)")
+ return name.Contains("(SoftMaskable)")
  || name == "Hidden/UI/SoftMask"
  || name == "Hidden/UI/TerminalMaskingShape";
  }

diff --git a/Runtime/Utilities/SoftMaskUtils.cs b/Runtime/Utilities/SoftMaskUtils.cs
@@ -202,7 +202,7 @@ public static Shader GetSoftMaskableShader(Shader baseShader,
  for (var i = 0; i < s_SoftMaskableShaderNameFormats.Length; i++)
  {
  var name = string.Format(s_SoftMaskableShaderNameFormats[i], shaderName);
- if (!name.EndsWith(" (SoftMaskable)", StringComparison.Ordinal)) continue;
+ if (!name.Contains("(SoftMaskable)", StringComparison.Ordinal)) continue;
 
  var shader = Shader.Find(name);
  if (!shader) continue;