Skip to content

Commit

Permalink
Add "Argon" performance points counter
Browse files Browse the repository at this point in the history
  • Loading branch information
frenzibyte committed Oct 26, 2023
1 parent daf4a03 commit 56eeb11
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using osu.Game.Rulesets.Osu.Judgements;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Play;
using osu.Game.Screens.Play.HUD;
using osuTK;

namespace osu.Game.Tests.Visual.Gameplay
Expand All @@ -30,7 +29,7 @@ public partial class TestScenePerformancePointsCounter : OsuTestScene

private int iteration;
private Bindable<JudgementResult> lastJudgementResult = new Bindable<JudgementResult>();
private PerformancePointsCounter counter;
private ArgonPerformancePointsCounter counter;

[SetUpSteps]
public void SetUpSteps() => AddStep("create components", () =>
Expand Down Expand Up @@ -66,7 +65,7 @@ public void SetUpSteps() => AddStep("create components", () =>

private void createCounter() => AddStep("Create counter", () =>
{
dependencyContainer.Child = counter = new PerformancePointsCounter
dependencyContainer.Child = counter = new ArgonPerformancePointsCounter
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Expand Down
62 changes: 62 additions & 0 deletions osu.Game/Screens/Play/ArgonPerformancePointsCounter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.

using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Resources.Localisation.Web;
using osu.Game.Screens.Play.HUD;
using osu.Game.Skinning;

namespace osu.Game.Screens.Play
{
public partial class ArgonPerformancePointsCounter : GameplayPerformancePointsCounter, ISerialisableDrawable
{
public bool UsesFixedAnchor { get; set; }

[BackgroundDependencyLoader]
private void load()
{
}

protected override IHasText CreateText() => new TextComponent();

private partial class TextComponent : CompositeDrawable, IHasText
{
private readonly OsuSpriteText text;

public LocalisableString Text
{
get => text.Text;
set => text.Text = value;
}

public TextComponent()
{
AutoSizeAxes = Axes.Both;

InternalChild = new FillFlowContainer
{
Direction = FillDirection.Vertical,
Children = new[]
{
new OsuSpriteText
{
Text = BeatmapsetsStrings.ShowScoreboardHeaderspp.ToUpper(),
Font = OsuFont.Torus.With(size: 12, weight: FontWeight.Bold),
},
text = new OsuSpriteText
{
Font = OsuFont.Torus.With(size: 16.8f, weight: FontWeight.Regular),
}
}
};
}
}
}
}

0 comments on commit 56eeb11

Please sign in to comment.