mirror of
https://github.com/mob-sakai/UIEffect.git
synced 2026-11-21 10:22:37 +08:00
feat: add GradationWrapMode option
This commit is contained in:
@@ -81,6 +81,7 @@ namespace Coffee.UIEffects.Editors
|
|||||||
private SerializedProperty _gradationOffset;
|
private SerializedProperty _gradationOffset;
|
||||||
private SerializedProperty _gradationScale;
|
private SerializedProperty _gradationScale;
|
||||||
private SerializedProperty _gradationRotation;
|
private SerializedProperty _gradationRotation;
|
||||||
|
private SerializedProperty _gradationWrapMode;
|
||||||
|
|
||||||
private SerializedProperty _edgeMode;
|
private SerializedProperty _edgeMode;
|
||||||
private SerializedProperty _edgeWidth;
|
private SerializedProperty _edgeWidth;
|
||||||
@@ -183,6 +184,7 @@ namespace Coffee.UIEffects.Editors
|
|||||||
_gradationOffset = serializedObject.FindProperty("m_GradationOffset");
|
_gradationOffset = serializedObject.FindProperty("m_GradationOffset");
|
||||||
_gradationScale = serializedObject.FindProperty("m_GradationScale");
|
_gradationScale = serializedObject.FindProperty("m_GradationScale");
|
||||||
_gradationRotation = serializedObject.FindProperty("m_GradationRotation");
|
_gradationRotation = serializedObject.FindProperty("m_GradationRotation");
|
||||||
|
_gradationWrapMode = serializedObject.FindProperty("m_GradationWrapMode");
|
||||||
|
|
||||||
_detailFilter = serializedObject.FindProperty("m_DetailFilter");
|
_detailFilter = serializedObject.FindProperty("m_DetailFilter");
|
||||||
_detailIntensity = serializedObject.FindProperty("m_DetailIntensity");
|
_detailIntensity = serializedObject.FindProperty("m_DetailIntensity");
|
||||||
@@ -372,6 +374,9 @@ namespace Coffee.UIEffects.Editors
|
|||||||
case GradationMode.AngleGradient:
|
case GradationMode.AngleGradient:
|
||||||
case GradationMode.RadialGradient:
|
case GradationMode.RadialGradient:
|
||||||
DrawGradientField(_gradationGradient);
|
DrawGradientField(_gradationGradient);
|
||||||
|
EditorGUI.indentLevel++;
|
||||||
|
EditorGUILayout.PropertyField(_gradationWrapMode, EditorGUIUtility.TrTempContent("Wrap Mode"));
|
||||||
|
EditorGUI.indentLevel--;
|
||||||
break;
|
break;
|
||||||
case GradationMode.Diagonal:
|
case GradationMode.Diagonal:
|
||||||
DrawColorPickerField("Top", _gradationColor1, _gradationColor2);
|
DrawColorPickerField("Top", _gradationColor1, _gradationColor2);
|
||||||
|
|||||||
@@ -201,6 +201,9 @@ namespace Coffee.UIEffects
|
|||||||
[Range(0, 360)]
|
[Range(0, 360)]
|
||||||
private float m_GradationRotation = 0;
|
private float m_GradationRotation = 0;
|
||||||
|
|
||||||
|
[SerializeField]
|
||||||
|
protected TextureWrapMode m_GradationWrapMode = TextureWrapMode.Repeat;
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
protected bool m_AllowToModifyMeshShape = true;
|
protected bool m_AllowToModifyMeshShape = true;
|
||||||
|
|
||||||
@@ -1284,6 +1287,18 @@ namespace Coffee.UIEffects
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public TextureWrapMode gradationWrapMode
|
||||||
|
{
|
||||||
|
get => m_GradationWrapMode;
|
||||||
|
set
|
||||||
|
{
|
||||||
|
if (m_GradationWrapMode == value) return;
|
||||||
|
context.m_GradationWrapMode = m_GradationWrapMode = value;
|
||||||
|
context.SetGradationDirty();
|
||||||
|
SetMaterialDirty();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public DetailFilter detailFilter
|
public DetailFilter detailFilter
|
||||||
{
|
{
|
||||||
get => m_DetailFilter;
|
get => m_DetailFilter;
|
||||||
@@ -1732,6 +1747,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!append || src.m_DetailFilter != DetailFilter.None)
|
if (!append || src.m_DetailFilter != DetailFilter.None)
|
||||||
@@ -1861,6 +1877,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!append || src.m_DetailFilter != DetailFilter.None)
|
if (!append || src.m_DetailFilter != DetailFilter.None)
|
||||||
@@ -1991,6 +2008,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!append || src.m_DetailFilter != DetailFilter.None)
|
if (!append || src.m_DetailFilter != DetailFilter.None)
|
||||||
@@ -2086,6 +2104,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
|
|
||||||
dst.m_DetailFilter = src.m_DetailFilter;
|
dst.m_DetailFilter = src.m_DetailFilter;
|
||||||
dst.m_DetailIntensity = src.m_DetailIntensity;
|
dst.m_DetailIntensity = src.m_DetailIntensity;
|
||||||
|
|||||||
@@ -231,6 +231,7 @@ namespace Coffee.UIEffects
|
|||||||
public float m_GradationOffset;
|
public float m_GradationOffset;
|
||||||
public float m_GradationScale;
|
public float m_GradationScale;
|
||||||
public float m_GradationRotation;
|
public float m_GradationRotation;
|
||||||
|
public TextureWrapMode m_GradationWrapMode;
|
||||||
|
|
||||||
public DetailFilter m_DetailFilter;
|
public DetailFilter m_DetailFilter;
|
||||||
public float m_DetailIntensity;
|
public float m_DetailIntensity;
|
||||||
@@ -293,6 +294,7 @@ namespace Coffee.UIEffects
|
|||||||
s_Colors[i] = m_GradationGradient.Evaluate((float)i / (w - 1));
|
s_Colors[i] = m_GradationGradient.Evaluate((float)i / (w - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_gradationRampTex.wrapMode = m_GradationWrapMode;
|
||||||
_gradationRampTex.filterMode = m_GradationGradient.mode == GradientMode.Blend
|
_gradationRampTex.filterMode = m_GradationGradient.mode == GradientMode.Blend
|
||||||
? FilterMode.Bilinear
|
? FilterMode.Bilinear
|
||||||
: FilterMode.Point;
|
: FilterMode.Point;
|
||||||
@@ -411,6 +413,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
|
|
||||||
dst.m_DetailFilter = src.m_DetailFilter;
|
dst.m_DetailFilter = src.m_DetailFilter;
|
||||||
dst.m_DetailIntensity = src.m_DetailIntensity;
|
dst.m_DetailIntensity = src.m_DetailIntensity;
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ namespace Coffee.UIEffects
|
|||||||
[Range(-1, 1)] public float m_GradationOffset = 0;
|
[Range(-1, 1)] public float m_GradationOffset = 0;
|
||||||
[PowerRange(0.01f, 10, 10)] public float m_GradationScale = 1;
|
[PowerRange(0.01f, 10, 10)] public float m_GradationScale = 1;
|
||||||
[Range(0, 360)] public float m_GradationRotation = 0;
|
[Range(0, 360)] public float m_GradationRotation = 0;
|
||||||
|
public TextureWrapMode m_GradationWrapMode = TextureWrapMode.Repeat;
|
||||||
|
|
||||||
public EdgeMode m_EdgeMode = EdgeMode.None;
|
public EdgeMode m_EdgeMode = EdgeMode.None;
|
||||||
[Range(0, 1)] public float m_EdgeWidth = 0.5f;
|
[Range(0, 1)] public float m_EdgeWidth = 0.5f;
|
||||||
@@ -164,6 +165,7 @@ namespace Coffee.UIEffects
|
|||||||
dst.m_GradationOffset = src.m_GradationOffset;
|
dst.m_GradationOffset = src.m_GradationOffset;
|
||||||
dst.m_GradationScale = src.m_GradationScale;
|
dst.m_GradationScale = src.m_GradationScale;
|
||||||
dst.m_GradationRotation = src.m_GradationRotation;
|
dst.m_GradationRotation = src.m_GradationRotation;
|
||||||
|
dst.m_GradationWrapMode = src.m_GradationWrapMode;
|
||||||
|
|
||||||
dst.m_DetailFilter = src.m_DetailFilter;
|
dst.m_DetailFilter = src.m_DetailFilter;
|
||||||
dst.m_DetailIntensity = src.m_DetailIntensity;
|
dst.m_DetailIntensity = src.m_DetailIntensity;
|
||||||
|
|||||||
Reference in New Issue
Block a user