mirror of
https://github.com/ppy/osu.git
synced 2026-05-17 19:04:00 +08:00
Bartłomiej Dach
12cc8e38da
Closes https://github.com/ppy/osu/issues/33465 probably. This reverts the replay frame de-duplication logic to what it was before https://github.com/ppy/osu/pull/33148#discussion_r2091549388. I don't have good reproduction steps. I tried to write a test case for this that isn't just "press and release a key in the same frame", thinking that maybe there was some loophole in the osu! touch input mapper that may produce this situation artificially, but I could not in many configurations. So I have to assume that this just *can happen* organically.
56 lines
1.9 KiB
C#
56 lines
1.9 KiB
C#
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
|
|
// See the LICENCE file in the repository root for full licence text.
|
|
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using osu.Game.Beatmaps;
|
|
using osu.Game.Replays.Legacy;
|
|
using osu.Game.Rulesets.Replays;
|
|
using osu.Game.Rulesets.Replays.Types;
|
|
using osuTK;
|
|
|
|
namespace osu.Game.Rulesets.Osu.Replays
|
|
{
|
|
public class OsuReplayFrame : ReplayFrame, IConvertibleReplayFrame
|
|
{
|
|
public Vector2 Position;
|
|
public List<OsuAction> Actions = new List<OsuAction>();
|
|
|
|
public OsuReplayFrame()
|
|
{
|
|
}
|
|
|
|
public OsuReplayFrame(double time, Vector2 position, params OsuAction[] actions)
|
|
: base(time)
|
|
{
|
|
Position = position;
|
|
Actions.AddRange(actions);
|
|
}
|
|
|
|
public void FromLegacy(LegacyReplayFrame currentFrame, IBeatmap beatmap, ReplayFrame? lastFrame = null)
|
|
{
|
|
Position = currentFrame.Position;
|
|
if (currentFrame.MouseLeft) Actions.Add(OsuAction.LeftButton);
|
|
if (currentFrame.MouseRight) Actions.Add(OsuAction.RightButton);
|
|
if (currentFrame.Smoke) Actions.Add(OsuAction.Smoke);
|
|
}
|
|
|
|
public LegacyReplayFrame ToLegacy(IBeatmap beatmap)
|
|
{
|
|
ReplayButtonState state = ReplayButtonState.None;
|
|
|
|
if (Actions.Contains(OsuAction.LeftButton))
|
|
state |= ReplayButtonState.Left1;
|
|
if (Actions.Contains(OsuAction.RightButton))
|
|
state |= ReplayButtonState.Right1;
|
|
if (Actions.Contains(OsuAction.Smoke))
|
|
state |= ReplayButtonState.Smoke;
|
|
|
|
return new LegacyReplayFrame(Time, Position.X, Position.Y, state);
|
|
}
|
|
|
|
public override bool IsEquivalentTo(ReplayFrame other)
|
|
=> other is OsuReplayFrame osuFrame && Time == osuFrame.Time && Position == osuFrame.Position && Actions.SequenceEqual(osuFrame.Actions);
|
|
}
|
|
}
|