h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Merge branch 'spectator-replay-watcher' into spectator-listing

Browse Source
This commit is contained in:
Dean Herbert 2020-10-28 23:17:50 +09:00
commit e1bf751dac
2 changed files with 60 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
View File

@ -36,19 +36,29 @@ namespace osu.Game.Tests.Visual.Gameplay
private int nextFrame;
private BeatmapSetInfo importedBeatmap;
private int importedBeatmapId;
public override void SetUpSteps()
{
base.SetUpSteps();
AddStep("reset sent frames", () => nextFrame = 0);
AddStep("import beatmap", () => ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Wait());
AddStep("import beatmap", () =>
{
importedBeatmap = ImportBeatmapTest.LoadOszIntoOsu(game, virtualTrack: true).Result;
importedBeatmapId = importedBeatmap.Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID ?? -1;
});
AddStep("add streaming client", () =>
{
Remove(testSpectatorStreamingClient);
Add(testSpectatorStreamingClient);
});
finish();
}
private OsuFramedReplayInputHandler replayHandler =>
@ -86,7 +96,7 @@ namespace osu.Game.Tests.Visual.Gameplay
start();
waitForPlayer();
AddUntilStep("game is paused", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value);
checkPaused(true);
sendFrames();
@ -115,6 +125,7 @@ namespace osu.Game.Tests.Visual.Gameplay
start();
sendFrames();
start();
sendFrames();
}
@ -125,8 +136,13 @@ namespace osu.Game.Tests.Visual.Gameplay
loadSpectatingScreen();
start();
sendFrames();
waitForPlayer();
checkPaused(true);
finish();
checkPaused(false);
// TODO: should replay until running out of frames then fail
}
@ -149,7 +165,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
loadSpectatingScreen();
start(88);
start(-1234);
sendFrames();
AddAssert("screen didn't change", () => Stack.CurrentScreen is Spectator);
@ -157,10 +173,12 @@ namespace osu.Game.Tests.Visual.Gameplay
private void waitForPlayer() => AddUntilStep("wait for player", () => Stack.CurrentScreen is Player);
private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId));
private void start(int? beatmapId = null) => AddStep("start play", () => testSpectatorStreamingClient.StartPlay(beatmapId ?? importedBeatmapId));
private void finish(int? beatmapId = null) => AddStep("end play", () => testSpectatorStreamingClient.EndPlay(beatmapId ?? importedBeatmapId));
private void checkPaused(bool state) =>
AddAssert($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
AddUntilStep($"game is {(state ? "paused" : "playing")}", () => player.ChildrenOfType<DrawableRuleset>().First().IsPaused.Value == state);
private void sendFrames(int count = 10)
{
@ -179,20 +197,25 @@ namespace osu.Game.Tests.Visual.Gameplay
internal class TestSpectatorStreamingClient : SpectatorStreamingClient
{
[Resolved]
private BeatmapManager beatmaps { get; set; }
public readonly User StreamingUser = new User { Id = 1234, Username = "Test user" };
public void StartPlay(int? beatmapId = null) => sendState(beatmapId);
private int beatmapId;
public void EndPlay()
public void StartPlay(int beatmapId)
{
this.beatmapId = beatmapId;
sendState(beatmapId);
}
public void EndPlay(int beatmapId)
{
((ISpectatorClient)this).UserFinishedPlaying((int)StreamingUser.Id, new SpectatorState
{
BeatmapID = beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
BeatmapID = beatmapId,
RulesetID = 0,
});
sentState = false;
}
private bool sentState;
@ -212,7 +235,7 @@ namespace osu.Game.Tests.Visual.Gameplay
((ISpectatorClient)this).UserSentFrames((int)StreamingUser.Id, bundle);
if (!sentState)
sendState();
sendState(beatmapId);
}
public override void WatchUser(int userId)
@ -220,18 +243,18 @@ namespace osu.Game.Tests.Visual.Gameplay
if (sentState)
{
// usually the server would do this.
sendState();
sendState(beatmapId);
}
base.WatchUser(userId);
}
private void sendState(int? beatmapId = null)
private void sendState(int beatmapId)
{
sentState = true;
((ISpectatorClient)this).UserBeganPlaying((int)StreamingUser.Id, new SpectatorState
{
BeatmapID = beatmapId ?? beatmaps.GetAllUsableBeatmapSets().First().Beatmaps.First(b => b.RulesetID == 0).OnlineBeatmapID,
BeatmapID = beatmapId,
RulesetID = 0,
});
}

26
osu.Game/Screens/Play/Spectator.cs
View File

@ -76,6 +76,11 @@ namespace osu.Game.Screens.Play
private BeatmapSetInfo onlineBeatmap;
/// <summary>
/// Becomes true if a new state is waiting to be loaded (while this screen was not active).
/// </summary>
private bool newStatePending;
public Spectator([NotNull] User targetUser)
{
this.targetUser = targetUser ?? throw new ArgumentNullException(nameof(targetUser));
@ -218,11 +223,23 @@ namespace osu.Game.Screens.Play
if (userId != targetUser.Id)
return;
replay ??= new Replay { HasReceivedAllFrames = false };
this.state = state;
Schedule(attemptStart);
if (this.IsCurrentScreen())
Schedule(attemptStart);
else
newStatePending = true;
}
public override void OnResuming(IScreen last)
{
base.OnResuming(last);
if (newStatePending)
{
attemptStart();
newStatePending = false;
}
}
private void userFinishedPlaying(int userId, SpectatorState state)
@ -266,8 +283,7 @@ namespace osu.Game.Screens.Play
return;
}
if (replay == null)
return;
replay ??= new Replay { HasReceivedAllFrames = false };
var scoreInfo = new ScoreInfo
{