feat: add Detail Filter feature

This commit is contained in:
mob-sakai
2025-03-16 15:56:07 +09:00
parent cb0e8d283b
commit 3e2c5c1613
22 changed files with 300 additions and 4 deletions
+47
View File
@@ -102,6 +102,14 @@ namespace Coffee.UIEffects.Editors
private SerializedProperty _edgeShinyAutoPlaySpeed;
private SerializedProperty _patternArea;
private SerializedProperty _detailFilter;
private SerializedProperty _detailIntensity;
private SerializedProperty _detailThreshold;
private SerializedProperty _detailTex;
private SerializedProperty _detailTexScale;
private SerializedProperty _detailTexOffset;
private SerializedProperty _detailTexSpeed;
private SerializedProperty _allowToModifyMeshShape;
private SerializedProperty _customRoot;
private SerializedProperty _flip;
@@ -188,6 +196,14 @@ namespace Coffee.UIEffects.Editors
_gradationScale = serializedObject.FindProperty("m_GradationScale");
_gradationRotation = serializedObject.FindProperty("m_GradationRotation");
_detailFilter = serializedObject.FindProperty("m_DetailFilter");
_detailIntensity = serializedObject.FindProperty("m_DetailIntensity");
_detailThreshold = serializedObject.FindProperty("m_DetailThreshold");
_detailTex = serializedObject.FindProperty("m_DetailTex");
_detailTexScale = serializedObject.FindProperty("m_DetailTexScale");
_detailTexOffset = serializedObject.FindProperty("m_DetailTexOffset");
_detailTexSpeed = serializedObject.FindProperty("m_DetailTexSpeed");
_allowToModifyMeshShape = serializedObject.FindProperty("m_AllowToModifyMeshShape");
_customRoot = serializedObject.FindProperty("m_CustomRoot");
_flip = serializedObject.FindProperty("m_Flip");
@@ -421,6 +437,37 @@ namespace Coffee.UIEffects.Editors
}
}
// Detail filter
DrawSeparator();
if (DrawHeaderPopup(_detailFilter))
{
EditorGUI.indentLevel++;
if ((DetailFilter)_detailFilter.intValue == DetailFilter.Masking)
{
EditorGUILayout.PropertyField(_detailThreshold);
}
else
{
EditorGUILayout.PropertyField(_detailIntensity);
}
EditorGUILayout.PropertyField(_detailTex);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(_detailTexScale, EditorGUIUtility.TrTempContent("Scale"));
EditorGUILayout.PropertyField(_detailTexOffset, EditorGUIUtility.TrTempContent("Offset"));
EditorGUILayout.PropertyField(_detailTexSpeed, EditorGUIUtility.TrTempContent("Speed"));
if (_detailTexSpeed.vector2Value != Vector2.zero)
{
EditorApplication.QueuePlayerLoopUpdate();
}
EditorGUILayout.PropertyField(_transitionRotation, EditorGUIUtility.TrTempContent("Rotation"));
EditorGUILayout.PropertyField(_transitionKeepAspectRatio,
EditorGUIUtility.TrTempContent("Keep Aspect Ratio"));
EditorGUI.indentLevel--;
EditorGUI.indentLevel--;
}
DrawSeparator();
expandOthers = EditorGUILayout.BeginFoldoutHeaderGroup(expandOthers, "Others");
if (expandOthers)
+10
View File
@@ -108,6 +108,16 @@ namespace Coffee.UIEffects
AngleGradient = 10
}
public enum DetailFilter
{
None = 0,
Masking = 1,
Multiply = 2,
Additive = 3,
Replace = 4,
MultiplyAdditive = 5
}
[Flags]
public enum Flip
{
+127
View File
@@ -223,6 +223,28 @@ namespace Coffee.UIEffects
[SerializeField]
protected PatternArea m_PatternArea = PatternArea.Inner;
[SerializeField]
protected DetailFilter m_DetailFilter = DetailFilter.None;
[Range(0, 1)]
[SerializeField]
protected float m_DetailIntensity = 1;
[SerializeField]
protected MinMax01 m_DetailThreshold = new MinMax01(0, 1);
[SerializeField]
protected Texture m_DetailTex;
[SerializeField]
protected Vector2 m_DetailTexScale = new Vector2(1, 1);
[SerializeField]
protected Vector2 m_DetailTexOffset = new Vector2(0, 0);
[SerializeField]
protected Vector2 m_DetailTexSpeed = new Vector2(0, 0);
[SerializeField]
protected RectTransform m_CustomRoot = null;
@@ -1216,6 +1238,84 @@ namespace Coffee.UIEffects
}
}
public DetailFilter detailFilter
{
get => m_DetailFilter;
set
{
if (m_DetailFilter == value) return;
context.detailFilter = m_DetailFilter = value;
SetMaterialDirty();
}
}
public float detailIntensity
{
get => m_DetailIntensity;
set
{
value = Mathf.Clamp(value, 0, 1);
if (Mathf.Approximately(m_DetailIntensity, value)) return;
context.detailIntensity = m_DetailIntensity = value;
SetMaterialDirty();
}
}
public MinMax01 detailThreshold
{
get => m_DetailThreshold;
set
{
if (m_DetailThreshold.Approximately(value)) return;
context.detailThreshold = m_DetailThreshold = value;
SetMaterialDirty();
}
}
public Texture detailTexture
{
get => m_DetailTex;
set
{
if (m_DetailTex == value) return;
context.detailTex = m_DetailTex = value;
SetMaterialDirty();
}
}
public Vector2 detailTextureScale
{
get => m_DetailTexScale;
set
{
if (m_DetailTexScale == value) return;
context.detailTexScale = m_DetailTexScale = value;
SetMaterialDirty();
}
}
public Vector2 detailTextureOffset
{
get => m_DetailTexOffset;
set
{
if (m_DetailTexOffset == value) return;
context.detailTexOffset = m_DetailTexOffset = value;
SetMaterialDirty();
}
}
public Vector2 detailTextureSpeed
{
get => m_DetailTexSpeed;
set
{
if (m_DetailTexSpeed == value) return;
context.detailTexSpeed = m_DetailTexSpeed = value;
SetMaterialDirty();
}
}
public bool allowToModifyMeshShape
{
get => m_AllowToModifyMeshShape;
@@ -1409,6 +1509,14 @@ namespace Coffee.UIEffects
c.gradationOffset = m_GradationOffset;
c.gradationScale = m_GradationScale;
c.gradationRotation = m_GradationRotation;
c.detailFilter = m_DetailFilter;
c.detailIntensity = m_DetailIntensity;
c.detailThreshold = m_DetailThreshold;
c.detailTex = m_DetailTex;
c.detailTexScale = m_DetailTexScale;
c.detailTexOffset = m_DetailTexOffset;
c.detailTexSpeed = m_DetailTexSpeed;
}
public override void ApplyContextToMaterial(Material material)
@@ -1605,6 +1713,17 @@ namespace Coffee.UIEffects
m_GradationRotation = preset.m_GradationRotation;
}
if (!append || preset.m_DetailFilter != DetailFilter.None)
{
m_DetailFilter = preset.m_DetailFilter;
m_DetailIntensity = preset.m_DetailIntensity;
m_DetailThreshold = preset.m_DetailThreshold;
m_DetailTex = preset.m_DetailTex;
m_DetailTexScale = preset.m_DetailTexScale;
m_DetailTexOffset = preset.m_DetailTexOffset;
m_DetailTexSpeed = preset.m_DetailTexSpeed;
}
UpdateContext(context);
SetVerticesDirty();
SetMaterialDirty();
@@ -1684,6 +1803,14 @@ namespace Coffee.UIEffects
m_GradationScale = c.gradationScale;
m_GradationRotation = c.gradationRotation;
m_DetailFilter = c.detailFilter;
m_DetailIntensity = c.detailIntensity;
m_DetailThreshold = c.detailThreshold;
m_DetailTex = c.detailTex;
m_DetailTexScale = c.detailTexScale;
m_DetailTexOffset = c.detailTexOffset;
m_DetailTexSpeed = c.detailTexSpeed;
UpdateContext(context);
SetVerticesDirty();
SetMaterialDirty();
+51 -4
View File
@@ -48,6 +48,11 @@ namespace Coffee.UIEffects
private static readonly int s_EdgeShinyRate = Shader.PropertyToID("_EdgeShinyRate");
private static readonly int s_EdgeShinyWidth = Shader.PropertyToID("_EdgeShinyWidth");
private static readonly int s_PatternArea = Shader.PropertyToID("_PatternArea");
private static readonly int s_DetailIntensity = Shader.PropertyToID("_DetailIntensity");
private static readonly int s_DetailThreshold = Shader.PropertyToID("_DetailThreshold");
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 string[] s_ToneKeywords =
{
@@ -150,6 +155,16 @@ namespace Coffee.UIEffects
"EDGE_COLOR_CONTRAST"
};
private static readonly string[] s_DetailKeywords =
{
"",
"DETAIL_MASKING",
"DETAIL_MULTIPLY",
"DETAIL_ADDITIVE",
"DETAIL_REPLACE",
"DETAIL_MULTIPLY_ADDITIVE"
};
private static readonly Vector2[][] s_ShadowVectors = new[]
{
Array.Empty<Vector2>(), // None
@@ -234,6 +249,14 @@ namespace Coffee.UIEffects
public float gradationRotation;
private List<float> _keyTimes;
public DetailFilter detailFilter;
public float detailIntensity;
public MinMax01 detailThreshold;
public Texture detailTex;
public Vector2 detailTexScale = new Vector2(1, 1);
public Vector2 detailTexOffset = new Vector2(0, 0);
public Vector2 detailTexSpeed = new Vector2(0, 0);
public bool willModifyMaterial => toneFilter != ToneFilter.None
|| colorFilter != ColorFilter.None
|| samplingFilter != SamplingFilter.None
@@ -241,7 +264,8 @@ namespace Coffee.UIEffects
|| srcBlendMode != BlendMode.One
|| dstBlendMode != BlendMode.OneMinusSrcAlpha
|| shadowMode != ShadowMode.None
|| edgeMode != EdgeMode.None;
|| edgeMode != EdgeMode.None
|| detailFilter != DetailFilter.None;
public bool willModifyVertex => willModifyMaterial
|| gradationMode != GradationMode.None;
@@ -322,6 +346,14 @@ namespace Coffee.UIEffects
gradationOffset = preset.gradationOffset;
gradationScale = preset.gradationScale;
gradationRotation = preset.gradationRotation;
detailFilter = preset.detailFilter;
detailIntensity = preset.detailIntensity;
detailThreshold = preset.detailThreshold;
detailTex = preset.detailTex;
detailTexScale = preset.detailTexScale;
detailTexOffset = preset.detailTexOffset;
detailTexSpeed = preset.detailTexSpeed;
}
public void SetGradationDirty()
@@ -351,7 +383,7 @@ namespace Coffee.UIEffects
material.SetFloat(s_TransitionRate, Mathf.Clamp01(transitionRate));
material.SetInt(s_TransitionReverse, transitionReverse ? 1 : 0);
material.SetTexture(s_TransitionTex, transitionTex);
material.SetTexture(s_TransitionTex, transitionFilter != 0 ? transitionTex : null);
material.SetVector(s_TransitionTex_ST,
new Vector4(transitionTexScale.x, transitionTexScale.y,
transitionTexOffset.x, transitionTexOffset.y));
@@ -392,6 +424,14 @@ namespace Coffee.UIEffects
material.SetFloat(s_EdgeShinyAutoPlaySpeed, edgeShinyAutoPlaySpeed);
material.SetInt(s_PatternArea, edgeMode != EdgeMode.None ? (int)patternArea : 0);
material.SetFloat(s_DetailIntensity, Mathf.Clamp01(detailIntensity));
material.SetVector(s_DetailThreshold, new Vector2(detailThreshold.min, detailThreshold.max));
material.SetTexture(s_DetailTex, detailFilter != 0 ? detailTex : null);
material.SetVector(s_DetailTex_ST,
new Vector4(detailTexScale.x, detailTexScale.y,
detailTexOffset.x, detailTexOffset.y));
material.SetVector(s_DetailTex_Speed, detailTexSpeed);
SetKeyword(material, s_ToneKeywords, (int)toneFilter);
SetKeyword(material, s_ColorKeywords, (int)colorFilter);
SetKeyword(material, s_SamplingKeywords, (int)samplingFilter);
@@ -430,6 +470,7 @@ namespace Coffee.UIEffects
break;
}
SetKeyword(material, s_DetailKeywords, (int)detailFilter);
SetKeyword(material, s_TargetKeywords, (int)targetMode);
@@ -440,6 +481,7 @@ namespace Coffee.UIEffects
{
if (!material) return;
material.SetVector(s_TransitionTex_Speed, enable ? (Vector4)transitionTexSpeed : Vector4.zero);
material.SetVector(s_DetailTex_Speed, enable ? (Vector4)detailTexSpeed : Vector4.zero);
material.SetFloat(s_TransitionAutoPlaySpeed, enable ? transitionAutoPlaySpeed : 0);
material.SetFloat(s_EdgeShinyAutoPlaySpeed, enable ? edgeShinyAutoPlaySpeed : 0);
}
@@ -502,10 +544,15 @@ namespace Coffee.UIEffects
rot *= Matrix4x4.Scale(new Vector3(multiplier, multiplier, 1));
}
if (transitionKeepAspectRatio && transitionTex)
var normalizeTex = transitionTex
? transitionTex
: detailTex
? detailTex
: null;
if (transitionKeepAspectRatio && normalizeTex)
{
var center = rect.center;
var aspectRatio = (float)transitionTex.width / transitionTex.height;
var aspectRatio = (float)normalizeTex.width / normalizeTex.height;
if (rect.width < rect.height)
{
rect.width = rect.height * aspectRatio;
@@ -66,6 +66,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -65,6 +65,7 @@ SubShader{
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -135,6 +135,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -136,6 +136,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -97,6 +97,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -100,6 +100,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -98,6 +98,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -135,6 +135,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -66,6 +66,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -65,6 +65,7 @@ SubShader{
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -135,6 +135,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -135,6 +135,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -97,6 +97,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -100,6 +100,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -97,6 +97,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
@@ -135,6 +135,7 @@ SubShader {
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====
+48
View File
@@ -36,6 +36,11 @@ uniform const float _EdgeShinyWidth;
uniform const half4 _EdgeColor;
uniform const int _EdgeColorGlow;
uniform const int _PatternArea;
uniform const float _DetailIntensity;
uniform const float2 _DetailThreshold;
uniform const sampler2D _DetailTex;
uniform const float4 _DetailTex_ST;
uniform const float2 _DetailTex_Speed;
// For performance reasons, limit the sampling of blur in TextMeshPro.
#ifdef UIEFFECT_TEXTMESHPRO
@@ -505,6 +510,48 @@ half4 apply_transition_filter(half4 color, const float alpha, const float2 uvLoc
return color;
}
half4 apply_detail_filter(half4 color, float2 uvLocal)
{
const half4 inColor = color;
const float2 uv = uvLocal * _DetailTex_ST.xy + _DetailTex_ST.zw + _Time.y * _DetailTex_Speed;
const half4 detail = tex2D(_DetailTex, uv);
#if DETAIL_MASKING // Detail.Masking
{
color *= inv_lerp(_DetailThreshold.x, _DetailThreshold.y, detail.a);
}
#elif DETAIL_MULTIPLY // Detail.Multiply
{
color.rgb *= detail.rgb;
color = lerp(inColor, color * detail.a, _DetailIntensity);
}
#elif DETAIL_ADDITIVE // Detail.Additive
{
color.rgb += detail.rgb * detail.a * color.a;
color = lerp(inColor, color, _DetailIntensity);
}
#elif DETAIL_REPLACE // Detail.Replace
{
color.rgb = detail.rgb * color.a;
color = lerp(inColor, color, _DetailIntensity * detail.a);
}
#elif DETAIL_MULTIPLY_ADDITIVE // Detail.MultiplyAdditive
{
color.rgb *= (1 + detail.rgb * detail.a);
color = lerp(inColor, color, _DetailIntensity);
}
#else
{
return color;
}
#endif
return color;
}
half to_value(float4 c)
{
#if SAMPLING_EDGE_LUMINANCE
@@ -559,6 +606,7 @@ half4 uieffect_internal(float2 uv, const float4 uvMask, const float2 uvLocal)
half4 color = apply_sampling_filter(uv, uvMask, uvLocal);
color = apply_tone_filter(color);
color = apply_transition_filter(color, alpha, uvLocal, edgeFactor);
color = apply_detail_filter(color, uvLocal);
if (-4 <= uvLocal.x + uvLocal.y)
{
+1
View File
@@ -67,6 +67,7 @@ Shader "Hidden/UI/Default (UIEffect)"
#pragma shader_feature_local_fragment _ SHADOW_COLOR_MULTIPLY SHADOW_COLOR_ADDITIVE SHADOW_COLOR_SUBTRACTIVE SHADOW_COLOR_REPLACE SHADOW_COLOR_MULTIPLY_LUMINANCE SHADOW_COLOR_MULTIPLY_ADDITIVE SHADOW_COLOR_HSV_MODIFIER SHADOW_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ EDGE_PLAIN EDGE_SHINY
#pragma shader_feature_local_fragment _ EDGE_COLOR_MULTIPLY EDGE_COLOR_ADDITIVE EDGE_COLOR_SUBTRACTIVE EDGE_COLOR_REPLACE EDGE_COLOR_MULTIPLY_LUMINANCE EDGE_COLOR_MULTIPLY_ADDITIVE EDGE_COLOR_HSV_MODIFIER EDGE_COLOR_CONTRAST
#pragma shader_feature_local_fragment _ DETAIL_MASKING DETAIL_MULTIPLY DETAIL_ADDITIVE DETAIL_REPLACE DETAIL_MULTIPLY_ADDITIVE
#pragma shader_feature_local_fragment _ TARGET_HUE TARGET_LUMINANCE
// ==== UIEFFECT END ====