From 7293c993480d3ff68dade947f0ef293b605d98b2 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Thu, 1 Aug 2019 17:01:11 +0900 Subject: [PATCH] Fix shader id for shiny --- .../UIExtensions/UIEffect/Scripts/UIShiny.cs | 54 +++++++++++++------ 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs index f2660a8..6c1ecd3 100644 --- a/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs +++ b/Assets/Coffee/UIExtensions/UIEffect/Scripts/UIShiny.cs @@ -303,7 +303,26 @@ namespace Coffee.UIExtensions return new Hash128 (); uint materialId = (uint)material.GetInstanceID (); - uint shaderId = (1 << 2) + (uint)(isTMPro ? isTMProMobile (material) ? 2 : 1 : 0); + uint shaderId = 1 << 3; + + string materialShaderName = material.shader.name; + if (materialShaderName.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal)) + { + shaderId += 2; + } + else if (materialShaderName.Equals ("TextMeshPro/Sprite", StringComparison.Ordinal)) + { + shaderId += 0; + } + else if (materialShaderName.StartsWith ("TextMeshPro/", StringComparison.Ordinal)) + { + shaderId += 1; + } + else + { + shaderId += 0; + } + return new Hash128 ( materialId, shaderId, @@ -314,19 +333,24 @@ namespace Coffee.UIExtensions public override void ModifyMaterial (Material material) { - Debug.LogFormat (this, $"ModifyMaterial {material}"); - var shaderName = isTMPro - ? isTMProMobile (material) - ? "TextMeshPro/Mobile/Distance Field (UIShiny)" - : "TextMeshPro/Distance Field (UIShiny)" - : "UI/Hidden/UI-Effect-Shiny"; - material.shader = Shader.Find (shaderName); - //SetShaderVariants (material, m_ColorMode); + string materialShaderName = material.shader.name; + if (materialShaderName.StartsWith ("TextMeshPro/Mobile/", StringComparison.Ordinal)) + { + material.shader = Shader.Find ("TextMeshPro/Mobile/Distance Field (UIShiny)"); + } + else if (materialShaderName.Equals ("TextMeshPro/Sprite", StringComparison.Ordinal)) + { + material.shader = Shader.Find ("UI/Hidden/UI-Effect-Shiny"); + } + else if (materialShaderName.StartsWith ("TextMeshPro/", StringComparison.Ordinal)) + { + material.shader = Shader.Find ("TextMeshPro/Distance Field (UIShiny)"); + } + else + { + material.shader = Shader.Find ("UI/Hidden/UI-Effect-Shiny"); + } - //if (m_NoiseTexture) - //{ - // material.SetTexture ("_NoiseTex", m_NoiseTexture); - //} ptex.RegisterMaterial (material); } @@ -409,10 +433,6 @@ namespace Coffee.UIExtensions protected override void SetEffectDirty() { - foreach (var m in materials) - { - ptex.RegisterMaterial (m); - } ptex.SetData(this, 0, m_EffectFactor); // param1.x : location ptex.SetData(this, 1, m_Width); // param1.y : width ptex.SetData(this, 2, m_Softness); // param1.z : softness