mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-19 17:22:37 +08:00
feat: add GradationIntensity and GradationColorFilter properties
This commit is contained in:
@@ -83,6 +83,8 @@ namespace Coffee.UIEffects.Editors
|
||||
private SerializedProperty _shadowColorGlow;
|
||||
|
||||
private SerializedProperty _gradationMode;
|
||||
private SerializedProperty _gradationIntensity;
|
||||
private SerializedProperty _gradationColorFilter;
|
||||
private SerializedProperty _gradationColor1;
|
||||
private SerializedProperty _gradationColor2;
|
||||
private SerializedProperty _gradationColor3;
|
||||
@@ -187,6 +189,8 @@ namespace Coffee.UIEffects.Editors
|
||||
_patternArea = serializedObject.FindProperty("m_PatternArea");
|
||||
|
||||
_gradationMode = serializedObject.FindProperty("m_GradationMode");
|
||||
_gradationIntensity = serializedObject.FindProperty("m_GradationIntensity");
|
||||
_gradationColorFilter = serializedObject.FindProperty("m_GradationColorFilter");
|
||||
_gradationColor1 = serializedObject.FindProperty("m_GradationColor1");
|
||||
_gradationColor2 = serializedObject.FindProperty("m_GradationColor2");
|
||||
_gradationColor3 = serializedObject.FindProperty("m_GradationColor3");
|
||||
@@ -220,8 +224,6 @@ namespace Coffee.UIEffects.Editors
|
||||
|
||||
public void DrawProperties()
|
||||
{
|
||||
serializedObject.Update();
|
||||
|
||||
// Tone filter
|
||||
if (DrawHeaderPopup(_toneFilter))
|
||||
{
|
||||
@@ -377,6 +379,7 @@ namespace Coffee.UIEffects.Editors
|
||||
if (DrawHeaderPopup(_gradationMode))
|
||||
{
|
||||
EditorGUI.indentLevel++;
|
||||
EditorGUILayout.PropertyField(_gradationColorFilter);
|
||||
switch ((GradationMode)_gradationMode.intValue)
|
||||
{
|
||||
case GradationMode.HorizontalGradient:
|
||||
@@ -400,6 +403,7 @@ namespace Coffee.UIEffects.Editors
|
||||
break;
|
||||
}
|
||||
|
||||
EditorGUILayout.PropertyField(_gradationIntensity);
|
||||
EditorGUILayout.PropertyField(_gradationOffset);
|
||||
EditorGUILayout.PropertyField(_gradationScale);
|
||||
|
||||
@@ -409,6 +413,8 @@ namespace Coffee.UIEffects.Editors
|
||||
EditorGUILayout.PropertyField(_gradationRotation);
|
||||
}
|
||||
|
||||
EditorGUILayout.PropertyField(_transitionKeepAspectRatio,
|
||||
EditorGUIUtility.TrTempContent("Keep Aspect Ratio"));
|
||||
EditorGUI.indentLevel--;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,17 @@ namespace Coffee.UIEffects
|
||||
Contrast = 8
|
||||
}
|
||||
|
||||
public enum GradationColorFilter
|
||||
{
|
||||
None = ColorFilter.None,
|
||||
Multiply = ColorFilter.Multiply,
|
||||
Additive = ColorFilter.Additive,
|
||||
Subtractive = ColorFilter.Subtractive,
|
||||
Replace = ColorFilter.Replace,
|
||||
MultiplyLuminance = ColorFilter.MultiplyLuminance,
|
||||
MultiplyAdditive = ColorFilter.MultiplyAdditive
|
||||
}
|
||||
|
||||
public enum SamplingFilter
|
||||
{
|
||||
None = 0,
|
||||
|
||||
@@ -162,6 +162,13 @@ namespace Coffee.UIEffects
|
||||
[SerializeField]
|
||||
protected GradationMode m_GradationMode = GradationMode.None;
|
||||
|
||||
[Range(0, 1)]
|
||||
[SerializeField]
|
||||
protected float m_GradationIntensity = 1;
|
||||
|
||||
[SerializeField]
|
||||
protected GradationColorFilter m_GradationColorFilter = GradationColorFilter.Multiply;
|
||||
|
||||
[SerializeField]
|
||||
protected Color m_GradationColor1 = Color.white;
|
||||
|
||||
@@ -1158,6 +1165,32 @@ namespace Coffee.UIEffects
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 0.0 (no effect) - 1.0 (full effect).
|
||||
/// </summary>
|
||||
public float gradationIntensity
|
||||
{
|
||||
get => m_GradationIntensity;
|
||||
set
|
||||
{
|
||||
value = Mathf.Clamp(value, 0, 1);
|
||||
if (Mathf.Approximately(m_GradationIntensity, value)) return;
|
||||
context.gradationIntensity = m_GradationIntensity = value;
|
||||
SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
|
||||
public GradationColorFilter gradationColorFilter
|
||||
{
|
||||
get => m_GradationColorFilter;
|
||||
set
|
||||
{
|
||||
if (m_GradationColorFilter == value) return;
|
||||
context.gradationColorFilter = m_GradationColorFilter = value;
|
||||
SetMaterialDirty();
|
||||
}
|
||||
}
|
||||
|
||||
public Color gradationColor1
|
||||
{
|
||||
get => m_GradationColor1;
|
||||
@@ -1546,6 +1579,8 @@ namespace Coffee.UIEffects
|
||||
c.patternArea = m_PatternArea;
|
||||
|
||||
c.gradationMode = m_GradationMode;
|
||||
c.gradationIntensity = m_GradationIntensity;
|
||||
c.gradationColorFilter = m_GradationColorFilter;
|
||||
c.gradationColor1 = m_GradationColor1;
|
||||
c.gradationColor2 = m_GradationColor2;
|
||||
c.gradationColor3 = m_GradationColor3;
|
||||
@@ -1747,6 +1782,8 @@ namespace Coffee.UIEffects
|
||||
if (!append || preset.m_GradationMode != GradationMode.None)
|
||||
{
|
||||
m_GradationMode = preset.m_GradationMode;
|
||||
m_GradationIntensity = preset.m_GradationIntensity;
|
||||
m_GradationColorFilter = preset.m_GradationColorFilter;
|
||||
m_GradationColor1 = preset.m_GradationColor1;
|
||||
m_GradationColor2 = preset.m_GradationColor2;
|
||||
m_GradationColor3 = preset.m_GradationColor3;
|
||||
@@ -1837,6 +1874,8 @@ namespace Coffee.UIEffects
|
||||
m_PatternArea = c.patternArea;
|
||||
|
||||
m_GradationMode = c.gradationMode;
|
||||
m_GradationIntensity = c.gradationIntensity;
|
||||
m_GradationColorFilter = c.gradationColorFilter;
|
||||
m_GradationColor1 = c.gradationColor1;
|
||||
m_GradationColor2 = c.gradationColor2;
|
||||
m_GradationColor3 = c.gradationColor3;
|
||||
|
||||
@@ -56,6 +56,8 @@ namespace Coffee.UIEffects
|
||||
private static readonly int s_DetailTex = Shader.PropertyToID("_DetailTex");
|
||||
private static readonly int s_DetailTex_ST = Shader.PropertyToID("_DetailTex_ST");
|
||||
private static readonly int s_DetailTex_Speed = Shader.PropertyToID("_DetailTex_Speed");
|
||||
private static readonly int s_GradationIntensity = Shader.PropertyToID("_GradationIntensity");
|
||||
private static readonly int s_GradationColorFilter = Shader.PropertyToID("_GradationColorFilter");
|
||||
private static readonly int s_GradationColor1 = Shader.PropertyToID("_GradationColor1");
|
||||
private static readonly int s_GradationColor2 = Shader.PropertyToID("_GradationColor2");
|
||||
private static readonly int s_GradationColor3 = Shader.PropertyToID("_GradationColor3");
|
||||
@@ -214,6 +216,8 @@ namespace Coffee.UIEffects
|
||||
public PatternArea patternArea;
|
||||
|
||||
public GradationMode gradationMode;
|
||||
public float gradationIntensity;
|
||||
public GradationColorFilter gradationColorFilter;
|
||||
public Color gradationColor1;
|
||||
public Color gradationColor2;
|
||||
public Color gradationColor3;
|
||||
@@ -313,6 +317,8 @@ namespace Coffee.UIEffects
|
||||
patternArea = preset.patternArea;
|
||||
|
||||
gradationMode = preset.gradationMode;
|
||||
gradationIntensity = preset.gradationIntensity;
|
||||
gradationColorFilter = preset.gradationColorFilter;
|
||||
gradationColor1 = preset.gradationColor1;
|
||||
gradationColor2 = preset.gradationColor2;
|
||||
gradationColor3 = preset.gradationColor3;
|
||||
@@ -405,6 +411,8 @@ namespace Coffee.UIEffects
|
||||
material.SetTexture(s_GradationTex, gradationMode != 0 ? gradationTex : null);
|
||||
material.SetVector(s_GradationTex_ST, GetGradationScaleAndOffset());
|
||||
|
||||
material.SetFloat(s_GradationIntensity, gradationIntensity);
|
||||
material.SetInt(s_GradationColorFilter, (int)gradationColorFilter);
|
||||
material.SetColor(s_GradationColor1, gradationColor1);
|
||||
material.SetColor(s_GradationColor2, gradationColor2);
|
||||
material.SetColor(s_GradationColor3, gradationColor3);
|
||||
|
||||
@@ -52,6 +52,8 @@ uniform const float2 _DetailThreshold;
|
||||
uniform const sampler2D _DetailTex;
|
||||
uniform const float4 _DetailTex_ST;
|
||||
uniform const float2 _DetailTex_Speed;
|
||||
uniform const float _GradationIntensity;
|
||||
uniform const int _GradationColorFilter;
|
||||
uniform const half4 _GradationColor1;
|
||||
uniform const half4 _GradationColor2;
|
||||
uniform const half4 _GradationColor3;
|
||||
@@ -550,32 +552,70 @@ half4 apply_transition_filter(half4 color, const float alpha, const float2 uvLoc
|
||||
return color;
|
||||
}
|
||||
|
||||
half4 apply_gradation_filter(half4 color, float2 uvGrad)
|
||||
half4 apply_gradation_filter(const half4 inColor, const float2 uvGrad)
|
||||
{
|
||||
const float2 uv = uvGrad * _GradationTex_ST.x + _GradationTex_ST.z;
|
||||
half4 factor = inColor;
|
||||
|
||||
#if GRADATION_GRADIENT // Gradation.Gradient
|
||||
{
|
||||
return color * tex2D(_GradationTex, uv);
|
||||
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);
|
||||
return color * lerp(_GradationColor1, _GradationColor2, t);
|
||||
factor = lerp(_GradationColor1, _GradationColor2, t);
|
||||
}
|
||||
#elif GRADATION_COLOR2 // Gradation.Color2
|
||||
{
|
||||
return color * lerp(_GradationColor1, _GradationColor2, saturate(uv.x));
|
||||
factor = lerp(_GradationColor1, _GradationColor2, saturate(uv.x));
|
||||
}
|
||||
#elif GRADATION_COLOR4 // Gradation.Color4
|
||||
{
|
||||
return color * lerp(
|
||||
factor = lerp(
|
||||
lerp(_GradationColor3, _GradationColor4, saturate(uv.x)),
|
||||
lerp(_GradationColor1, _GradationColor2, saturate(uv.x)),
|
||||
saturate(uv.y));
|
||||
}
|
||||
#else
|
||||
{
|
||||
return inColor;
|
||||
}
|
||||
#endif
|
||||
|
||||
const int mode = _GradationColorFilter;
|
||||
const float intensity = _GradationIntensity;
|
||||
half4 color = inColor;
|
||||
if (mode == 1) // Color.Multiply
|
||||
{
|
||||
color.rgb = color.rgb * factor.rgb;
|
||||
}
|
||||
else if (mode == 2) // Color.Additive
|
||||
{
|
||||
color.rgb = color.rgb + factor.rgb * color.a;
|
||||
}
|
||||
else if (mode == 3) // Color.Subtractive
|
||||
{
|
||||
color.rgb = color.rgb - factor.rgb * color.a;
|
||||
}
|
||||
else if (mode == 4) // Color.Replace
|
||||
{
|
||||
color.rgb = factor.rgb * color.a;
|
||||
}
|
||||
else if (mode == 5) // Color.MultiplyLuminance
|
||||
{
|
||||
color.rgb = (1 + Luminance(color.rgb)) * factor.rgb / 2 * color.a;
|
||||
}
|
||||
else if (mode == 6) // Color.MultiplyAdditive
|
||||
{
|
||||
color.rgb = color.rgb * (1 + factor.rgb);
|
||||
}
|
||||
|
||||
if (0 < mode)
|
||||
{
|
||||
color = lerp(inColor, color, intensity);
|
||||
}
|
||||
|
||||
return color;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user