Add "argon" variant of song progress display

osu.Game.Tests/Skins/SkinDeserialisationTest.cs

@@ -41,6 +41,8 @@ public class SkinDeserialisationTest
  "Archives/modified-default-20220818.osk",
  // Covers longest combo counter
  "Archives/modified-default-20221012.osk",
+ // Covers Argon variant of song progress bar
+ "Archives/modified-argon-20221024.osk",
  // Covers TextElement and BeatmapInfoDrawable
  "Archives/modified-default-20221102.osk",
  // Covers BPM counter.

osu.Game.Tests/Visual/Gameplay/SkinnableHUDComponentTestScene.cs

@@ -20,7 +20,9 @@ public void SetUp() => Schedule(() =>
  {
  var implementation = skin is LegacySkin
  ? CreateLegacyImplementation()
- : CreateDefaultImplementation();
+ : skin is ArgonSkin
+ ? CreateArgonImplementation()
+ : CreateDefaultImplementation();
 
  implementation.Anchor = Anchor.Centre;
  implementation.Origin = Anchor.Centre;
@@ -29,6 +31,7 @@ public void SetUp() => Schedule(() =>
  });
 
  protected abstract Drawable CreateDefaultImplementation();
+ protected virtual Drawable CreateArgonImplementation() => CreateDefaultImplementation();
  protected abstract Drawable CreateLegacyImplementation();
  }
 }

osu.Game.Tests/Visual/Gameplay/TestSceneArgonSongProgressGraph.cs

@@ -0,0 +1,69 @@
+// 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 System.Collections.Generic;
+using System.Diagnostics;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Testing;
+using osu.Framework.Utils;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Play.HUD;
+
+namespace osu.Game.Tests.Visual.Gameplay
+{
+ [TestFixture]
+ public partial class TestSceneArgonSongProgressGraph : OsuTestScene
+ {
+ private TestArgonSongProgressGraph? graph;
+
+ [SetUpSteps]
+ public void SetupSteps()
+ {
+ AddStep("add new big graph", () =>
+ {
+ if (graph != null)
+ {
+ graph.Expire();
+ graph = null;
+ }
+
+ Add(graph = new TestArgonSongProgressGraph
+ {
+ RelativeSizeAxes = Axes.X,
+ Height = 200,
+ Anchor = Anchor.TopLeft,
+ Origin = Anchor.TopLeft,
+ });
+ });
+ }
+
+ [Test]
+ public void Test()
+ {
+ AddAssert("ensure not created", () => graph!.CreationCount == 0);
+ AddStep("display values", displayRandomValues);
+ }
+
+ private void displayRandomValues()
+ {
+ Debug.Assert(graph != null);
+ var objects = new List<HitObject>();
+ for (double i = 0; i < 5000; i += RNG.NextDouble() * 10 + i / 1000)
+ objects.Add(new HitObject { StartTime = i });
+
+ graph.Objects = objects;
+ }
+
+ private partial class TestArgonSongProgressGraph : ArgonSongProgressGraph
+ {
+ public int CreationCount { get; private set; }
+
+ protected override void RecreateGraph()
+ {
+ base.RecreateGraph();
+ CreationCount++;
+ }
+ }
+ }
+}

osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs

@@ -188,7 +188,7 @@ public void TestHoldForMenuDoesWorkWhenHidden()
  [Test]
  public void TestInputDoesntWorkWhenHUDHidden()
  {
- SongProgressBar? getSongProgress() => hudOverlay.ChildrenOfType<SongProgressBar>().SingleOrDefault();
+ ISongProgressBar? getSongProgress() => hudOverlay.ChildrenOfType<ISongProgressBar>().SingleOrDefault();
 
  bool seeked = false;
 
@@ -204,7 +204,7 @@ public void TestInputDoesntWorkWhenHUDHidden()
 
  Debug.Assert(progress != null);
 
- progress.ShowHandle = true;
+ progress.Interactive = true;
  progress.OnSeek += _ => seeked = true;
  });
 
@@ -213,7 +213,17 @@ public void TestInputDoesntWorkWhenHUDHidden()
 
  AddStep("attempt seek", () =>
  {
- InputManager.MoveMouseTo(getSongProgress());
+ switch (getSongProgress())
+ {
+ case SongProgressBar defaultBar:
+ InputManager.MoveMouseTo(defaultBar);
+ break;
+
+ case ArgonSongProgressBar argonBar:
+ InputManager.MoveMouseTo(argonBar);
+ break;
+ }
+
  InputManager.Click(MouseButton.Left);
  });
 

osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs

@@ -72,6 +72,8 @@ private void setHitObjects()
 
  protected override Drawable CreateDefaultImplementation() => new DefaultSongProgress();
 
+ protected override Drawable CreateArgonImplementation() => new ArgonSongProgress();
+
  protected override Drawable CreateLegacyImplementation() => new LegacySongProgress();
  }
 }

osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs

@@ -121,7 +121,7 @@ public void TestSpectatorPlayerInteractiveElementsHidden()
  AddUntilStep("all interactive elements removed", () => this.ChildrenOfType<Player>().All(p =>
  !p.ChildrenOfType<PlayerSettingsOverlay>().Any() &&
  !p.ChildrenOfType<HoldForMenuButton>().Any() &&
- p.ChildrenOfType<SongProgressBar>().SingleOrDefault()?.ShowHandle == false));
+ p.ChildrenOfType<ISongProgressBar>().SingleOrDefault()?.Interactive == false));
 
  AddStep("restore config hud visibility", () => config.SetValue(OsuSetting.HUDVisibilityMode, originalConfigValue));
  }

osu.Game/Screens/Play/HUD/ArgonSongProgress.cs

@@ -0,0 +1,139 @@
+// 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 System.Collections.Generic;
+using osu.Framework.Allocation;
+using osu.Framework.Bindables;
+using osu.Framework.Graphics;
+using osu.Framework.Timing;
+using osu.Game.Configuration;
+using osu.Game.Graphics;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.UI;
+
+namespace osu.Game.Screens.Play.HUD
+{
+ public partial class ArgonSongProgress : SongProgress
+ {
+ private readonly SongProgressInfo info;
+ private readonly ArgonSongProgressGraph graph;
+ private readonly ArgonSongProgressBar bar;
+
+ private const float bar_height = 10;
+
+ public readonly Bindable<bool> AllowSeeking = new BindableBool();
+
+ [SettingSource("Show difficulty graph", "Whether a graph displaying difficulty throughout the beatmap should be shown")]
+ public Bindable<bool> ShowGraph { get; } = new BindableBool(true);
+
+ [Resolved]
+ private DrawableRuleset? drawableRuleset { get; set; }
+
+ private IClock referenceClock => drawableRuleset?.FrameStableClock ?? GameplayClock;
+
+ [Resolved]
+ private Player? player { get; set; }
+
+ public ArgonSongProgress()
+ {
+ Anchor = Anchor.BottomCentre;
+ Origin = Anchor.BottomCentre;
+ Children = new Drawable[]
+ {
+ info = new SongProgressInfo
+ {
+ Origin = Anchor.TopLeft,
+ Name = "Info",
+ Anchor = Anchor.TopLeft,
+ RelativeSizeAxes = Axes.X,
+ ShowProgress = false
+ },
+ graph = new ArgonSongProgressGraph
+ {
+ Name = "Difficulty graph",
+ Origin = Anchor.BottomLeft,
+ Anchor = Anchor.BottomLeft,
+ RelativeSizeAxes = Axes.X,
+ Masking = true,
+ CornerRadius = 5,
+ },
+ bar = new ArgonSongProgressBar(bar_height)
+ {
+ Name = "Seek bar",
+ Origin = Anchor.BottomLeft,
+ Anchor = Anchor.BottomLeft,
+ OnSeek = time => player?.Seek(time),
+ }
+ };
+ RelativeSizeAxes = Axes.X;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load()
+ {
+ base.LoadComplete();
+
+ if (drawableRuleset != null)
+ {
+ if (player?.Configuration.AllowUserInteraction == true)
+ ((IBindable<bool>)AllowSeeking).BindTo(drawableRuleset.HasReplayLoaded);
+ }
+
+ info.ShowProgress = false;
+ info.TextColour = Colour4.White;
+ info.Font = OsuFont.Torus.With(size: 18, weight: FontWeight.Bold);
+ }
+
+ protected override void LoadComplete()
+ {
+ AllowSeeking.BindValueChanged(_ => updateBarVisibility(), true);
+ ShowGraph.BindValueChanged(_ => updateGraphVisibility(), true);
+ }
+
+ protected override void UpdateObjects(IEnumerable<HitObject> objects)
+ {
+ graph.Objects = objects;
+
+ info.StartTime = bar.StartTime = FirstHitTime;
+ info.EndTime = bar.EndTime = LastHitTime;
+ }
+
+ private void updateBarVisibility()
+ {
+ bar.Interactive = AllowSeeking.Value;
+ }
+
+ private void updateGraphVisibility()
+ {
+ graph.FadeTo(ShowGraph.Value ? 1 : 0, 200, Easing.In);
+ bar.ShowBackground = !ShowGraph.Value;
+ }
+
+ protected override void Update()
+ {
+ base.Update();
+ Height = bar.Height + bar_height + info.Height;
+ graph.Height = bar.Height;
+ }
+
+ protected override void PopIn()
+ {
+ this.FadeIn(500, Easing.OutQuint);
+ }
+
+ protected override void PopOut()
+ {
+ this.FadeOut(100);
+ }
+
+ protected override void UpdateProgress(double progress, bool isIntro)
+ {
+ bar.ReferenceTime = GameplayClock.CurrentTime;
+
+ if (isIntro)
+ bar.CurrentTime = 0;
+ else
+ bar.CurrentTime = referenceClock.CurrentTime;
+ }
+ }
+}