feat: separate reverse curve for UIEffectTweener

close #312
This commit is contained in:
mob-sakai
2025-03-12 14:08:38 +09:00
parent 6b8dc5ec33
commit 2540b75349
2 changed files with 60 additions and 1 deletions
@@ -12,6 +12,8 @@ namespace Coffee.UIEffects.Editors
private SerializedProperty _cullingMask;
private SerializedProperty _direction;
private SerializedProperty _curve;
private SerializedProperty _separateReverseCurve;
private SerializedProperty _reverseCurve;
private SerializedProperty _delay;
private SerializedProperty _duration;
private SerializedProperty _interval;
@@ -28,6 +30,8 @@ namespace Coffee.UIEffects.Editors
_cullingMask = serializedObject.FindProperty("m_CullingMask");
_direction = serializedObject.FindProperty("m_Direction");
_curve = serializedObject.FindProperty("m_Curve");
_separateReverseCurve = serializedObject.FindProperty("m_SeparateReverseCurve");
_reverseCurve = serializedObject.FindProperty("m_ReverseCurve");
_playOnEnable = serializedObject.FindProperty("m_PlayOnEnable");
_resetTimeOnEnable = serializedObject.FindProperty("m_ResetTimeOnEnable");
_delay = serializedObject.FindProperty("m_Delay");
@@ -52,6 +56,17 @@ namespace Coffee.UIEffects.Editors
EditorGUILayout.PropertyField(_cullingMask);
EditorGUILayout.PropertyField(_direction);
EditorGUILayout.PropertyField(_curve);
var pos = EditorGUILayout.GetControlRect();
var rect = new Rect(pos.x, pos.y, EditorGUIUtility.labelWidth + 20, pos.height);
EditorGUI.PropertyField(rect, _separateReverseCurve);
if (_separateReverseCurve.boolValue)
{
rect.x += rect.width;
rect.width = pos.width - rect.width;
EditorGUI.PropertyField(rect, _reverseCurve, GUIContent.none);
}
EditorGUILayout.PropertyField(_delay);
EditorGUILayout.PropertyField(_duration);
EditorGUILayout.PropertyField(_interval);
+45 -1
View File
@@ -64,6 +64,13 @@ namespace Coffee.UIEffects
[SerializeField]
private AnimationCurve m_Curve = AnimationCurve.Linear(0, 0, 1, 1);
[SerializeField]
private bool m_SeparateReverseCurve;
[Tooltip("The curve to tween the properties.")]
[SerializeField]
private AnimationCurve m_ReverseCurve = AnimationCurve.Linear(0, 0, 1, 1);
[Tooltip("The delay in seconds before the tween starts.")]
[SerializeField]
[Range(0f, 10)]
@@ -149,7 +156,32 @@ namespace Coffee.UIEffects
_rate = value;
if (!target || cullingMask == 0) return;
var evaluatedRate = m_Curve.Evaluate(_rate);
var currentCurve = curve;
if (separateReverseCurve)
{
switch (wrapMode)
{
case WrapMode.Once:
case WrapMode.Loop:
if (direction == Direction.Reverse)
{
currentCurve = reverseCurve;
}
break;
case WrapMode.PingPongOnce:
case WrapMode.PingPongLoop:
if (delay + duration + interval <= _time)
{
currentCurve = reverseCurve;
}
break;
}
}
var evaluatedRate = currentCurve.Evaluate(_rate);
target.SetRate(evaluatedRate, cullingMask);
}
}
@@ -270,6 +302,18 @@ namespace Coffee.UIEffects
set => m_Curve = value;
}
public bool separateReverseCurve
{
get => m_SeparateReverseCurve;
set => m_SeparateReverseCurve = value;
}
public AnimationCurve reverseCurve
{
get => m_ReverseCurve;
set => m_ReverseCurve = value;
}
/// <summary>
/// Event to invoke when the tween has completed.
/// </summary>