mirror of
https://github.com/ppy/osu.git
synced 2025-02-21 03:02:54 +08:00
Improve Autopilot cursor movement
This commit is contained in:
parent
4dd2d47458
commit
e1534ce348
@ -7,12 +7,14 @@ using System.Linq;
|
|||||||
using osu.Framework.Graphics.Sprites;
|
using osu.Framework.Graphics.Sprites;
|
||||||
using osu.Framework.Input.StateChanges;
|
using osu.Framework.Input.StateChanges;
|
||||||
using osu.Framework.Localisation;
|
using osu.Framework.Localisation;
|
||||||
|
using osu.Framework.Utils;
|
||||||
using osu.Game.Graphics;
|
using osu.Game.Graphics;
|
||||||
using osu.Game.Rulesets.Mods;
|
using osu.Game.Rulesets.Mods;
|
||||||
using osu.Game.Rulesets.Osu.Objects;
|
using osu.Game.Rulesets.Osu.Objects;
|
||||||
using osu.Game.Rulesets.Osu.Replays;
|
using osu.Game.Rulesets.Osu.Replays;
|
||||||
using osu.Game.Rulesets.Osu.UI;
|
using osu.Game.Rulesets.Osu.UI;
|
||||||
using osu.Game.Rulesets.UI;
|
using osu.Game.Rulesets.UI;
|
||||||
|
using osuTK;
|
||||||
|
|
||||||
namespace osu.Game.Rulesets.Osu.Mods
|
namespace osu.Game.Rulesets.Osu.Mods
|
||||||
{
|
{
|
||||||
@ -47,15 +49,29 @@ namespace osu.Game.Rulesets.Osu.Mods
|
|||||||
|
|
||||||
double time = playfield.Clock.CurrentTime;
|
double time = playfield.Clock.CurrentTime;
|
||||||
|
|
||||||
// Very naive implementation of autopilot based on proximity to replay frames.
|
while (currentFrame < replayFrames.Count - 1 && time > replayFrames[currentFrame + 1].Time)
|
||||||
// Special case for the first frame is required to ensure the mouse is in a sane position until the actual time of the first frame is hit.
|
|
||||||
// TODO: this needs to be based on user interactions to better match stable (pausing until judgement is registered).
|
|
||||||
if (currentFrame < 0 || Math.Abs(replayFrames[currentFrame + 1].Time - time) <= Math.Abs(replayFrames[currentFrame].Time - time))
|
|
||||||
{
|
{
|
||||||
currentFrame++;
|
currentFrame++;
|
||||||
new MousePositionAbsoluteInput { Position = playfield.ToScreenSpace(replayFrames[currentFrame].Position) }.Apply(inputManager.CurrentState, inputManager);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Very naive implementation of autopilot based on interpolation between replay frames.
|
||||||
|
// Special case for the first frame is required to ensure the mouse is in a sane position until the actual time of the first frame is hit.
|
||||||
|
// TODO: this needs to be based on user interactions to better match stable (pausing until judgement is registered).
|
||||||
|
Vector2 position = Vector2.Zero;
|
||||||
|
if (currentFrame < 0)
|
||||||
|
{
|
||||||
|
position = replayFrames.First().Position;
|
||||||
|
}
|
||||||
|
else if (currentFrame == replayFrames.Count - 1)
|
||||||
|
{
|
||||||
|
position = replayFrames.Last().Position;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
position = Interpolation.ValueAt(time, replayFrames[currentFrame].Position, replayFrames[currentFrame + 1].Position, replayFrames[currentFrame].Time, replayFrames[currentFrame + 1].Time);
|
||||||
|
}
|
||||||
|
new MousePositionAbsoluteInput { Position = playfield.ToScreenSpace(position) }.Apply(inputManager.CurrentState, inputManager);
|
||||||
|
|
||||||
// TODO: Implement the functionality to automatically spin spinners
|
// TODO: Implement the functionality to automatically spin spinners
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user