Skip to content

[LitMotionAnimation] Added preserve toggle and selectable value state enum for mid-stop #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emptybraces wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −4
Open

[LitMotionAnimation] Added preserve toggle and selectable value state enum for mid-stop #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/LitMotion/Assets/LitMotion.Animation/Editor/LitMotionAnimationEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ VisualElement CreateSettingsPanel()
var box = CreateBox("Settings");
box.Add(new PropertyField(serializedObject.FindProperty("playOnAwake")));
box.Add(new PropertyField(serializedObject.FindProperty("animationMode")));
box.Add(new PropertyField(serializedObject.FindProperty("preserve")));
return box;
}

Expand Down
7 changes: 5 additions & 2 deletions src/LitMotion/Assets/LitMotion.Animation/Runtime/LitMotionAnimation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ enum AnimationMode

[SerializeField] bool playOnAwake = true;
[SerializeField] AnimationMode animationMode;
[SerializeField] bool preserve = true;

[SerializeReference]
LitMotionAnimationComponent[] components;
Expand All @@ -41,7 +42,8 @@ void MoveNextMotion()

if (isActive)
{
handle.Preserve();
if (preserve)
handle.Preserve();
MotionManager.GetManagedDataRef(handle, false).OnCompleteAction += MoveNextMotion;
}

Expand Down Expand Up @@ -105,7 +107,8 @@ public void Play()

if (handle.IsActive())
{
handle.Preserve();
if (preserve)
handle.Preserve();
}

playingComponents.Add(component);
Expand Down
18 changes: 16 additions & 2 deletions src/LitMotion/Assets/LitMotion.Animation/Runtime/PropertyAnimationComponent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,25 @@ public abstract class PropertyAnimationComponent<TObject, TValue, TOptions, TAda
[SerializeField] TObject target;
[SerializeField] SerializableMotionSettings<TValue, TOptions> settings;
[SerializeField] bool relative;
enum InterruptionValueState { StartValue, Stay, EndValue }
[SerializeField] InterruptionValueState interruptionValueState;

TValue startValue;
TValue startValue, endValue;

public override void OnStop()
{
if (target == null) return;
SetValue(target, startValue);
switch (interruptionValueState)
{
case InterruptionValueState.StartValue:
SetValue(target, startValue);
break;
case InterruptionValueState.Stay:
break;
case InterruptionValueState.EndValue:
SetValue(target, endValue);
break;
}
}

public override MotionHandle Play()
Expand All @@ -31,6 +43,7 @@ public override MotionHandle Play()

if (relative)
{
endValue = GetRelativeValue(startValue, settings.EndValue);
handle = LMotion.Create<TValue, TOptions, TAdapter>(settings)
.Bind(this, (x, state) =>
{
Expand All @@ -39,6 +52,7 @@ public override MotionHandle Play()
}
else
{
endValue = settings.EndValue;
handle = LMotion.Create<TValue, TOptions, TAdapter>(settings)
.Bind(this, (x, state) =>
{
Expand Down