Skip to content

WIP: Support multiple sequencing #206

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
monry wants to merge 1 commit into
base: develop/v0.1.0
Choose a base branch
from
Open

WIP: Support multiple sequencing #206

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
27 changes: 19 additions & 8 deletions Assets/Scripts/Connector/Event/SimpleAnimationEvent.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,27 @@ private AnimationClip AnimationClip
private SimpleAnimationCollector SimpleAnimationCollector => simpleAnimationCollector;
private AnimationClipCollector AnimationClipCollector => animationClipCollector;

private ISubject<(SimpleAnimationEventType eventType, AnimationClip animationClip)> CurrentStateSubject { get; } = new Subject<(SimpleAnimationEventType, AnimationClip)>();
private IReactiveProperty<(SimpleAnimationEventType eventType, AnimationClip animationClip)> CurrentStateProperty { get; } = new ReactiveProperty<(SimpleAnimationEventType eventType, AnimationClip animationClip)>();

private IDictionary<SimpleAnimation.State, bool> PlayingStatuses { get; } = new Dictionary<SimpleAnimation.State, bool>();

private IObservable<Message> MessageObservable { get; set; }

public override IObservable<Message> OnConnectAsObservable()
{
ObserveSimpleAnimation();
return CurrentStateSubject
CurrentStateProperty.Value = default;

if (MessageObservable == default)
{
ObserveSimpleAnimation();
}

MessageObservable = CurrentStateProperty
.Where(x => (AnimationClip == default || x.animationClip == AnimationClip) && x.eventType == SimpleAnimationEventType)
.Select(x => this.CreateMessage(x, MessageParameterKey));
.Select(x => this.CreateMessage(x, MessageParameterKey))
.FirstOrDefault();

return MessageObservable;
}

private void ObserveSimpleAnimation()
Expand All @@ -84,7 +95,7 @@ private void ObserveSimpleAnimation()
{
PlayingStatuses[state] = false;
state
.ObserveEveryValueChanged(x => (SimpleAnimation.IsPlaying(x.name), x.normalizedTime))
.ObserveEveryValueChanged(x => (SimpleAnimation.IsPlaying(x.name) && !Mathf.Approximately(x.normalizedTime, 1.0f), x.normalizedTime))
.Pairwise()
.SubscribeWithState(state, OnChangeAnimatorStateInfo)
.AddTo(this);
Expand All @@ -96,17 +107,17 @@ private void OnChangeAnimatorStateInfo(Pair<(bool isPlaying, float normalizedTim
if (pair.Current.isPlaying && !PlayingStatuses[state])
{
PlayingStatuses[state] = true;
CurrentStateSubject.OnNext((SimpleAnimationEventType.Play, state.clip));
CurrentStateProperty.Value = (SimpleAnimationEventType.Play, state.clip);
}
else if (pair.Previous.isPlaying && !pair.Current.isPlaying && PlayingStatuses[state])
{
PlayingStatuses[state] = false;
CurrentStateSubject.OnNext((SimpleAnimationEventType.Stop, state.clip));
CurrentStateProperty.Value = (SimpleAnimationEventType.Stop, state.clip);
}
else if (pair.Previous.normalizedTime < 1.0f && Mathf.Approximately(pair.Current.normalizedTime, 1.0f) && PlayingStatuses[state])
{
PlayingStatuses[state] = false;
CurrentStateSubject.OnNext((SimpleAnimationEventType.Stop, state.clip));
CurrentStateProperty.Value = (SimpleAnimationEventType.Stop, state.clip);
}
}

Expand Down