1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 09:33:02 +08:00

Integrate "Argon" performance points counter with HUD layout

This commit is contained in:
Salman Ahmed 2024-03-05 03:58:43 +03:00
parent d7f1e50d66
commit 0cbcfcecdc

View File

@ -118,6 +118,7 @@ namespace osu.Game.Skinning
var wedgePieces = container.OfType<ArgonWedgePiece>().ToArray(); var wedgePieces = container.OfType<ArgonWedgePiece>().ToArray();
var score = container.OfType<ArgonScoreCounter>().FirstOrDefault(); var score = container.OfType<ArgonScoreCounter>().FirstOrDefault();
var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault(); var accuracy = container.OfType<ArgonAccuracyCounter>().FirstOrDefault();
var performancePoints = container.OfType<ArgonPerformancePointsCounter>().FirstOrDefault();
var combo = container.OfType<ArgonComboCounter>().FirstOrDefault(); var combo = container.OfType<ArgonComboCounter>().FirstOrDefault();
var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault(); var songProgress = container.OfType<ArgonSongProgress>().FirstOrDefault();
var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault(); var keyCounter = container.OfType<ArgonKeyCounterDisplay>().FirstOrDefault();
@ -159,6 +160,13 @@ namespace osu.Game.Skinning
accuracy.Origin = Anchor.TopRight; accuracy.Origin = Anchor.TopRight;
} }
if (performancePoints != null && accuracy != null)
{
performancePoints.Position = new Vector2(accuracy.X, accuracy.Y + accuracy.DrawHeight + 10);
performancePoints.Anchor = Anchor.TopRight;
performancePoints.Origin = Anchor.TopRight;
}
var hitError = container.OfType<HitErrorMeter>().FirstOrDefault(); var hitError = container.OfType<HitErrorMeter>().FirstOrDefault();
if (hitError != null) if (hitError != null)
@ -224,6 +232,7 @@ namespace osu.Game.Skinning
CornerRadius = { Value = 0.5f } CornerRadius = { Value = 0.5f }
}, },
new ArgonAccuracyCounter(), new ArgonAccuracyCounter(),
new ArgonPerformancePointsCounter(),
new ArgonComboCounter new ArgonComboCounter
{ {
Scale = new Vector2(1.3f) Scale = new Vector2(1.3f)