h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 14:30:42 +08:00
Code Issues Releases Wiki Activity

Merge pull request #33192 from peppy/fix-multiplayer-position-display-two-player

Browse Source 
Fix multiplayer position display looking wrong when player count is low
This commit is contained in:
Bartłomiej Dach
2025-05-19 13:04:22 +02:00
committed by GitHub
Unverified
parent 34e5c7ee42 962ec3dca0
commit 9d438bac29
2 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayerPositionDisplay.cs
+34
View File
@@ -86,5 +86,39 @@ namespace osu.Game.Tests.Visual.Multiplayer
AddStep("change local user", () => ((DummyAPIAccess)API).LocalUser.Value = new GuestUser());
AddUntilStep("display hidden", () => display.Alpha, () => Is.EqualTo(0));
}
[Test]
public void TestTwoPlayers()
{
AddStep("create content", () =>
{
Children = new Drawable[]
{
new DependencyProvidingContainer
{
RelativeSizeAxes = Axes.Both,
CachedDependencies =
[
(typeof(IGameplayLeaderboardProvider), leaderboardProvider = new TestSceneGameplayLeaderboard.TestGameplayLeaderboardProvider()),
(typeof(GameplayState), gameplayState = TestGameplayState.Create(new OsuRuleset()))
],
Child = display = new MultiplayerPositionDisplay
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
}
}
};
score = leaderboardProvider.CreateLeaderboardScore(new BindableLong(), API.LocalUser.Value, true);
score.Position.BindTo(position);
var r = leaderboardProvider.CreateRandomScore(new APIUser());
r.Position.Value = 1;
});
AddStep("first place", () => position.Value = 1);
AddStep("second place", () => position.Value = 2);
}
}
}
osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPositionDisplay.cs
+4 -2
View File
@@ -158,13 +158,15 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
return;
}
float relativePosition = (float)(position.Value.Value - 1) / scores.Count;
float relativePosition = Math.Clamp((float)(position.Value.Value - 1) / Math.Max(scores.Count - 1, 1), 0, 1);
positionText.Current.Value = position.Value.Value;
positionText.FadeTo(min_alpha + (max_alpha - min_alpha) * (1 - relativePosition), 1000, Easing.OutPow10);
localPlayerMarker.FadeIn();
localPlayerMarker.MoveToX(marker_size / 2 + Math.Min(relativePosition * (width - marker_size / 2), width - marker_size / 2), 1000, Easing.OutPow10);
float markerWidth = Math.Max(marker_size, width / scores.Count);
localPlayerMarker.ResizeWidthTo(markerWidth, 1000, Easing.OutPow10);
localPlayerMarker.MoveToX(markerWidth / 2 + (width - markerWidth) * relativePosition, 1000, Easing.OutPow10);
}
private partial class PositionCounter : RollingCounter<int>