RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test and spawn smoke immediately

This commit is contained in:
Alden Wu 2022-09-19 10:16:05 -07:00
parent 74056201e7
commit c3b8e1d718
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game.Rulesets.Osu/OsuInputManager.cs
View File

@ -10,7 +10,6 @@
using osu.Framework.Input.Events;
using osu.Framework.Input.StateChanges.Events;
using osu.Game.Rulesets.UI;
using osu.Game.Screens.Play;
namespace osu.Game.Rulesets.Osu
{

14
osu.Game.Rulesets.Osu/Skinning/Smoke.cs
View File

@ -166,17 +166,21 @@ protected override void LoadComplete()
{
base.LoadComplete();
Anchor = Anchor.TopLeft;
Origin = Anchor.TopLeft;
SmokeStartTime = Time.Current;
totalDistance = PointInterval;
if (smokeContainer != null)
{
smokeContainer.SmokeMoved += onSmokeMoved;
smokeContainer.SmokeEnded += onSmokeEnded;
IsActive = true;
onSmokeMoved(smokeContainer.LastMousePosition, Time.Current);
}
Anchor = Anchor.TopLeft;
Origin = Anchor.TopLeft;
SmokeStartTime = Time.Current;
}
private Vector2 nextPointDirection()

4
osu.Game.Rulesets.Osu/UI/SmokeContainer.cs
View File

@ -19,6 +19,8 @@ public class SmokeContainer : Container, IRequireHighFrequencyMousePosition, IKe
public event Action<Vector2, double>? SmokeMoved;
public event Action<double>? SmokeEnded;
public Vector2 LastMousePosition;
private bool isSmoking;
public override bool ReceivePositionalInputAt(Vector2 _) => true;
@ -50,6 +52,8 @@ protected override bool OnMouseMove(MouseMoveEvent e)
if (isSmoking)
SmokeMoved?.Invoke(e.MousePosition, Time.Current);
LastMousePosition = e.MousePosition;
return base.OnMouseMove(e);
}
}

2
osu.Game.Tests/Visual/Gameplay/TestSceneGameplayRewinding.cs
View File

@ -31,7 +31,7 @@ public void TestNoJudgementsOnRewind()
AddUntilStep("wait for track to start running", () => Beatmap.Value.Track.IsRunning);
addSeekStep(3000);
AddAssert("all judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => h.Judged));
AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.All(kc => kc.CountPresses >= 7));
AddUntilStep("key counter counted keys", () => Player.HUDOverlay.KeyCounter.Children.Select(kc => kc.CountPresses).Sum() == 15);
AddStep("clear results", () => Player.Results.Clear());
addSeekStep(0);
AddAssert("none judged", () => Player.DrawableRuleset.Playfield.AllHitObjects.All(h => !h.Judged));