From 179ec89a0215af9d8046e150d98fa06371155e93 Mon Sep 17 00:00:00 2001 From: mob-sakai <12690315+mob-sakai@users.noreply.github.com> Date: Sat, 24 May 2025 19:18:59 +0900 Subject: [PATCH] feat: add `GradationMode.RadialGradient` feature close #348 --- Packages/src/Editor/UIEffectPropertyEditor.cs | 1 + Packages/src/Runtime/Enums.cs | 1 + Packages/src/Runtime/UIEffectContext.cs | 16 +++++++++------- ...dden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader | 2 +- .../Hidden-TMP_Bitmap-UIEffect-Unity6.shader | 2 +- ...Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader | 2 +- .../Hidden-TMP_SDF SSD-UIEffect-Unity6.shader | 2 +- ...TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader | 2 +- ...den-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader | 2 +- .../Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader | 2 +- .../Hidden-TMP_SDF-UIEffect-Unity6.shader | 2 +- .../Hidden-TMP_Bitmap-Mobile-UIEffect.shader | 2 +- .../Hidden-TMP_Bitmap-UIEffect.shader | 2 +- .../Hidden-TMP_SDF Overlay-UIEffect.shader | 2 +- .../Hidden-TMP_SDF SSD-UIEffect.shader | 2 +- ...Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader | 2 +- .../Hidden-TMP_SDF-Mobile SSD-UIEffect.shader | 2 +- .../Hidden-TMP_SDF-Mobile-UIEffect.shader | 2 +- .../Hidden-TMP_SDF-UIEffect.shader | 2 +- Packages/src/Shaders/UIEffect.cginc | 11 ++++------- Packages/src/Shaders/UIEffect.shader | 2 +- 21 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Packages/src/Editor/UIEffectPropertyEditor.cs b/Packages/src/Editor/UIEffectPropertyEditor.cs index acdde70..7f5d808 100644 --- a/Packages/src/Editor/UIEffectPropertyEditor.cs +++ b/Packages/src/Editor/UIEffectPropertyEditor.cs @@ -370,6 +370,7 @@ namespace Coffee.UIEffects.Editors case GradationMode.HorizontalGradient: case GradationMode.VerticalGradient: case GradationMode.AngleGradient: + case GradationMode.RadialGradient: DrawGradientField(_gradationGradient); break; case GradationMode.Diagonal: diff --git a/Packages/src/Runtime/Enums.cs b/Packages/src/Runtime/Enums.cs index eed684a..6c945b3 100644 --- a/Packages/src/Runtime/Enums.cs +++ b/Packages/src/Runtime/Enums.cs @@ -113,6 +113,7 @@ namespace Coffee.UIEffects VerticalGradient = 4, RadialFast = 5, RadialDetail = 6, + RadialGradient = 12, Diagonal = 11, DiagonalToRightBottom = 7, DiagonalToLeftBottom = 8, diff --git a/Packages/src/Runtime/UIEffectContext.cs b/Packages/src/Runtime/UIEffectContext.cs index 537b500..615cfb9 100644 --- a/Packages/src/Runtime/UIEffectContext.cs +++ b/Packages/src/Runtime/UIEffectContext.cs @@ -65,6 +65,7 @@ namespace Coffee.UIEffects private static readonly int s_GradationColor4 = Shader.PropertyToID("_GradationColor4"); private static readonly int s_GradationTex = Shader.PropertyToID("_GradationTex"); private static readonly int s_GradationTex_ST = Shader.PropertyToID("_GradationTex_ST"); + private static readonly int s_GradationRadial = Shader.PropertyToID("_GradationRadial"); private static readonly int s_RootViewMatrix = Shader.PropertyToID("_RootViewMatrix"); private static readonly int s_GradViewMatrix = Shader.PropertyToID("_GradViewMatrix"); private static readonly int s_MirrorRootViewMatrix = Shader.PropertyToID("_MirrorRootViewMatrix"); @@ -142,7 +143,6 @@ namespace Coffee.UIEffects { "", "GRADATION_GRADIENT", - "GRADATION_RADIAL", "GRADATION_COLOR2", "GRADATION_COLOR4" }; @@ -510,6 +510,9 @@ namespace Coffee.UIEffects material.SetColor(s_GradationColor2, m_GradationColor2); material.SetColor(s_GradationColor3, m_GradationColor3); material.SetColor(s_GradationColor4, m_GradationColor4); + material.SetInt(s_GradationRadial, m_GradationMode == GradationMode.RadialFast + || m_GradationMode == GradationMode.RadialDetail + || m_GradationMode == GradationMode.RadialGradient ? 1 : 0); material.SetFloat(s_DetailIntensity, Mathf.Clamp01(m_DetailIntensity)); material.SetColor(s_DetailColor, m_DetailColor); @@ -536,21 +539,20 @@ namespace Coffee.UIEffects case GradationMode.HorizontalGradient: case GradationMode.VerticalGradient: case GradationMode.AngleGradient: + case GradationMode.RadialGradient: SetKeyword(material, s_GradationKeywords, 1); break; - case GradationMode.RadialFast: - case GradationMode.RadialDetail: - SetKeyword(material, s_GradationKeywords, 2); - break; case GradationMode.Horizontal: case GradationMode.Vertical: case GradationMode.DiagonalToRightBottom: case GradationMode.DiagonalToLeftBottom: case GradationMode.Angle: - SetKeyword(material, s_GradationKeywords, 3); + case GradationMode.RadialFast: + case GradationMode.RadialDetail: + SetKeyword(material, s_GradationKeywords, 2); break; case GradationMode.Diagonal: - SetKeyword(material, s_GradationKeywords, 4); + SetKeyword(material, s_GradationKeywords, 3); break; } diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader index d96726e..a71ba3e 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-Mobile-UIEffect-Unity6.shader @@ -65,7 +65,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader index 4264035..6477535 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_Bitmap-UIEffect-Unity6.shader @@ -64,7 +64,7 @@ SubShader{ #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader index 75d5dbd..e064e70 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF Overlay-UIEffect-Unity6.shader @@ -134,7 +134,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader index cba3719..1439581 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF SSD-UIEffect-Unity6.shader @@ -135,7 +135,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader index aeb6f55..5ee0198 100644 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile Overlay-UIEffect-Unity6.shader @@ -96,7 +96,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader index 833f540..c11d221 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile SSD-UIEffect-Unity6.shader @@ -99,7 +99,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader index e39a3c3..18ee7d5 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-Mobile-UIEffect-Unity6.shader @@ -97,7 +97,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader index cd0c217..bb17936 100755 --- a/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader +++ b/Packages/src/Samples~/TextMeshPro Support (Unity 6)~/Hidden-TMP_SDF-UIEffect-Unity6.shader @@ -134,7 +134,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader index 493ed83..974dc8a 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-Mobile-UIEffect.shader @@ -65,7 +65,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader index 5cb0fc7..869f50e 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_Bitmap-UIEffect.shader @@ -64,7 +64,7 @@ SubShader{ #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader index e2bdd33..4c09b08 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF Overlay-UIEffect.shader @@ -134,7 +134,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader index 33812c5..99be183 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF SSD-UIEffect.shader @@ -134,7 +134,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader index 1ef523f..847311a 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile Overlay-UIEffect.shader @@ -96,7 +96,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader index 5e57b9e..b17c523 100755 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile SSD-UIEffect.shader @@ -99,7 +99,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader index 543cb6c..34baa89 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-Mobile-UIEffect.shader @@ -96,7 +96,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader index 0e7a0e8..c2e5d70 100644 --- a/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader +++ b/Packages/src/Samples~/TextMeshPro Support~/Hidden-TMP_SDF-UIEffect.shader @@ -134,7 +134,7 @@ SubShader { #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ==== diff --git a/Packages/src/Shaders/UIEffect.cginc b/Packages/src/Shaders/UIEffect.cginc index 02d70d3..d7e3176 100644 --- a/Packages/src/Shaders/UIEffect.cginc +++ b/Packages/src/Shaders/UIEffect.cginc @@ -62,6 +62,7 @@ uniform const half4 _GradationColor3; uniform const half4 _GradationColor4; uniform const sampler2D _GradationTex; uniform const float4 _GradationTex_ST; +uniform const int _GradationRadial; uniform const matrix _RootViewMatrix; uniform const matrix _GradViewMatrix; uniform const matrix _MirrorRootViewMatrix; @@ -573,20 +574,16 @@ half4 apply_transition_filter(half4 color, const float alpha, const float2 uvLoc half4 apply_gradation_filter(const half4 inColor, const float2 uvGrad) { const float2 uv = uvGrad * _GradationTex_ST.x + _GradationTex_ST.z; + const float uvRad = length((uvGrad - float2(0.5, 0.5)) * 2 * _GradationTex_ST.x) + _GradationTex_ST.z; half4 factor = inColor; #if GRADATION_GRADIENT // Gradation.Gradient { - factor = tex2D(_GradationTex, uv); - } - #elif GRADATION_RADIAL // Gradation.Radial - { - float t = saturate(length((uvGrad - float2(0.5, 0.5)) * 2 * _GradationTex_ST.x) + _GradationTex_ST.z); - factor = lerp(_GradationColor1, _GradationColor2, t); + factor = tex2D(_GradationTex, float2(_GradationRadial ? uvRad : uv.x, 0.5)); } #elif GRADATION_COLOR2 // Gradation.Color2 { - factor = lerp(_GradationColor1, _GradationColor2, saturate(uv.x)); + factor = lerp(_GradationColor1, _GradationColor2, _GradationRadial ? saturate(uvRad) : saturate(uv.x)); } #elif GRADATION_COLOR4 // Gradation.Color4 { diff --git a/Packages/src/Shaders/UIEffect.shader b/Packages/src/Shaders/UIEffect.shader index 28666bd..c7d5d1b 100644 --- a/Packages/src/Shaders/UIEffect.shader +++ b/Packages/src/Shaders/UIEffect.shader @@ -66,7 +66,7 @@ Shader "Hidden/UI/Default (UIEffect)" #pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY #pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_SUBTRACTIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE #pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE - #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_RADIAL GRADATION_COLOR2 GRADATION_COLOR4 + #pragma shader_feature_local_fragment _ GRADATION_GRADIENT GRADATION_COLOR2 GRADATION_COLOR4 #pragma shader_feature_fragment _ UIEFFECT_EDITOR // ==== UIEFFECT END ====