sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-07 00:23:59 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into score-processor-enum-getvalue-overhead-reduction

Browse Source
This commit is contained in:
Salman Ahmed
2021-08-26 09:55:09 +03:00
committed by GitHub
parent e32933eb54 fb732785d6
commit 2f26d270a3
2 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointLifetimeEntry.cs
View File

@ -4,6 +4,7 @@
#nullable enable #nullable enable
using System; using System;
using System.Diagnostics;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics.Performance; using osu.Framework.Graphics.Performance;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -20,8 +21,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
{ {
Start = start; Start = start;
LifetimeStart = Start.StartTime; LifetimeStart = Start.StartTime;
bindEvents();
} }
private OsuHitObject? end; private OsuHitObject? end;
@ -41,31 +40,39 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
} }
} }
private bool wasBound;
private void bindEvents() private void bindEvents()
{ {
UnbindEvents(); UnbindEvents();
if (End == null)
return;
// Note: Positions are bound for instantaneous feedback from positional changes from the editor, before ApplyDefaults() is called on hitobjects. // Note: Positions are bound for instantaneous feedback from positional changes from the editor, before ApplyDefaults() is called on hitobjects.
Start.DefaultsApplied += onDefaultsApplied; Start.DefaultsApplied += onDefaultsApplied;
Start.PositionBindable.ValueChanged += onPositionChanged; Start.PositionBindable.ValueChanged += onPositionChanged;
if (End != null) End.DefaultsApplied += onDefaultsApplied;
{ End.PositionBindable.ValueChanged += onPositionChanged;
End.DefaultsApplied += onDefaultsApplied;
End.PositionBindable.ValueChanged += onPositionChanged; wasBound = true;
}
} }
public void UnbindEvents() public void UnbindEvents()
{ {
if (!wasBound)
return;
Debug.Assert(End != null);
Start.DefaultsApplied -= onDefaultsApplied; Start.DefaultsApplied -= onDefaultsApplied;
Start.PositionBindable.ValueChanged -= onPositionChanged; Start.PositionBindable.ValueChanged -= onPositionChanged;
if (End != null) End.DefaultsApplied -= onDefaultsApplied;
{ End.PositionBindable.ValueChanged -= onPositionChanged;
End.DefaultsApplied -= onDefaultsApplied;
End.PositionBindable.ValueChanged -= onPositionChanged; wasBound = false;
}
} }
private void onDefaultsApplied(HitObject obj) => refreshLifetimes(); private void onDefaultsApplied(HitObject obj) => refreshLifetimes();

21
osu.Game/Input/Handlers/ReplayInputHandler.cs
View File

@ -42,9 +42,24 @@ namespace osu.Game.Input.Handlers
if (!(state is RulesetInputManagerInputState<T> inputState)) if (!(state is RulesetInputManagerInputState<T> inputState))
throw new InvalidOperationException($"{nameof(ReplayState<T>)} should only be applied to a {nameof(RulesetInputManagerInputState<T>)}"); throw new InvalidOperationException($"{nameof(ReplayState<T>)} should only be applied to a {nameof(RulesetInputManagerInputState<T>)}");
var lastPressed = inputState.LastReplayState?.PressedActions ?? new List<T>(); T[] released = Array.Empty<T>();
var released = lastPressed.Except(PressedActions).ToArray(); T[] pressed = Array.Empty<T>();
var pressed = PressedActions.Except(lastPressed).ToArray();
var lastPressed = inputState.LastReplayState?.PressedActions;
if (lastPressed == null || lastPressed.Count == 0)
{
pressed = PressedActions.ToArray();
}
else if (PressedActions.Count == 0)
{
released = lastPressed.ToArray();
}
else if (!lastPressed.SequenceEqual(PressedActions))
{
released = lastPressed.Except(PressedActions).ToArray();
pressed = PressedActions.Except(lastPressed).ToArray();
}
inputState.LastReplayState = this; inputState.LastReplayState = this;