diff --git a/osu.Android.props b/osu.Android.props
index 4614c2b9b7..247140ceef 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,8 +51,8 @@
-
-
+
+
diff --git a/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs
new file mode 100644
index 0000000000..ff557638a9
--- /dev/null
+++ b/osu.Game.Rulesets.Mania.Tests/Skinning/TestSceneBarLine.cs
@@ -0,0 +1,52 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Game.Rulesets.Mania.Beatmaps;
+using osu.Game.Rulesets.Mania.Objects;
+using osu.Game.Rulesets.Mania.UI;
+
+namespace osu.Game.Rulesets.Mania.Tests.Skinning
+{
+ public class TestSceneBarLine : ManiaSkinnableTestScene
+ {
+ [Test]
+ public void TestMinor()
+ {
+ AddStep("Create barlines", () => recreate());
+ }
+
+ private void recreate(Func>? createBarLines = null)
+ {
+ var stageDefinitions = new List
+ {
+ new StageDefinition { Columns = 4 },
+ };
+
+ SetContents(_ => new ManiaPlayfield(stageDefinitions).With(s =>
+ {
+ if (createBarLines != null)
+ {
+ var barLines = createBarLines();
+
+ foreach (var b in barLines)
+ s.Add(b);
+
+ return;
+ }
+
+ for (int i = 0; i < 64; i++)
+ {
+ s.Add(new BarLine
+ {
+ StartTime = Time.Current + i * 500,
+ Major = i % 4 == 0,
+ });
+ }
+ }));
+ }
+ }
+}
diff --git a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
index 614ef76a3b..73dfaaa878 100644
--- a/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
+++ b/osu.Game.Rulesets.Mania/Mods/ManiaModConstantSpeed.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Rulesets.Mania.Mods
public override string Acronym => "CS";
- public override double ScoreMultiplier => 1;
+ public override double ScoreMultiplier => 0.9;
public override string Description => "No more tricky speed changes!";
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
index 0e2d6bce21..6020348938 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableBarLine.cs
@@ -1,12 +1,9 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
using osuTK;
-using osuTK.Graphics;
namespace osu.Game.Rulesets.Mania.Objects.Drawables
{
@@ -16,21 +13,11 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
///
public class DrawableBarLine : DrawableManiaHitObject
{
- ///
- /// Height of major bar line triangles.
- ///
- private const float triangle_height = 12;
-
- ///
- /// Offset of the major bar line triangles from the sides of the bar line.
- ///
- private const float triangle_offset = 9;
-
public DrawableBarLine(BarLine barLine)
: base(barLine)
{
RelativeSizeAxes = Axes.X;
- Height = 2f;
+ Height = barLine.Major ? 1.7f : 1.2f;
AddInternal(new Box
{
@@ -38,34 +25,33 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both,
- Colour = new Color4(255, 204, 33, 255),
+ Alpha = barLine.Major ? 0.5f : 0.2f
});
if (barLine.Major)
{
- AddInternal(new EquilateralTriangle
+ Vector2 size = new Vector2(22, 6);
+ const float line_offset = 4;
+
+ AddInternal(new Circle
{
- Name = "Left triangle",
- Anchor = Anchor.BottomLeft,
- Origin = Anchor.TopCentre,
- Size = new Vector2(triangle_height),
- X = -triangle_offset,
- Rotation = 90
+ Name = "Left line",
+ Anchor = Anchor.CentreLeft,
+ Origin = Anchor.CentreRight,
+
+ Size = size,
+ X = -line_offset,
});
- AddInternal(new EquilateralTriangle
+ AddInternal(new Circle
{
- Name = "Right triangle",
- Anchor = Anchor.BottomRight,
- Origin = Anchor.TopCentre,
- Size = new Vector2(triangle_height),
- X = triangle_offset,
- Rotation = -90
+ Name = "Right line",
+ Anchor = Anchor.CentreRight,
+ Origin = Anchor.CentreLeft,
+ Size = size,
+ X = line_offset,
});
}
-
- if (!barLine.Major)
- Alpha = 0.2f;
}
protected override void UpdateInitialTransforms()
diff --git a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
index 335ef31019..8df8afe147 100644
--- a/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
+++ b/osu.Game.Rulesets.Osu.Tests/Mods/TestSceneOsuModDoubleTime.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Osu.Tests.Mods
{
Mod = mod,
PassCondition = () => Player.ScoreProcessor.JudgedHits >= 2 &&
- Precision.AlmostEquals(Player.GameplayClockContainer.GameplayClock.Rate, mod.SpeedChange.Value)
+ Precision.AlmostEquals(Player.GameplayClockContainer.Rate, mod.SpeedChange.Value)
});
}
}
diff --git a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
index 46f7c461f8..7e995f2dde 100644
--- a/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
+++ b/osu.Game.Rulesets.Osu.Tests/OsuDifficultyCalculatorTest.cs
@@ -17,18 +17,18 @@ namespace osu.Game.Rulesets.Osu.Tests
{
protected override string ResourceAssembly => "osu.Game.Rulesets.Osu";
- [TestCase(6.6369583000323935d, 206, "diffcalc-test")]
- [TestCase(1.4476531024675374d, 45, "zero-length-sliders")]
+ [TestCase(6.7115569159190587d, 206, "diffcalc-test")]
+ [TestCase(1.4391311903612753d, 45, "zero-length-sliders")]
public void Test(double expectedStarRating, int expectedMaxCombo, string name)
=> base.Test(expectedStarRating, expectedMaxCombo, name);
- [TestCase(8.8816128335486386d, 206, "diffcalc-test")]
- [TestCase(1.7540389962596916d, 45, "zero-length-sliders")]
+ [TestCase(8.9757300665532966d, 206, "diffcalc-test")]
+ [TestCase(1.7437232654020756d, 45, "zero-length-sliders")]
public void TestClockRateAdjusted(double expectedStarRating, int expectedMaxCombo, string name)
=> Test(expectedStarRating, expectedMaxCombo, name, new OsuModDoubleTime());
- [TestCase(6.6369583000323935d, 239, "diffcalc-test")]
- [TestCase(1.4476531024675374d, 54, "zero-length-sliders")]
+ [TestCase(6.7115569159190587d, 239, "diffcalc-test")]
+ [TestCase(1.4391311903612753d, 54, "zero-length-sliders")]
public void TestClassicMod(double expectedStarRating, int expectedMaxCombo, string name)
=> Test(expectedStarRating, expectedMaxCombo, name, new OsuModClassic());
diff --git a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
index d1796f2231..b7f91c22f4 100644
--- a/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
+++ b/osu.Game.Rulesets.Osu.Tests/TestSceneSpinnerRotation.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Generic;
using System.Linq;
@@ -12,7 +10,6 @@ using osu.Framework.Audio;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Testing;
using osu.Framework.Timing;
-using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Replays;
using osu.Game.Rulesets.Objects;
@@ -36,16 +33,16 @@ namespace osu.Game.Rulesets.Osu.Tests
private const double spinner_duration = 6000;
[Resolved]
- private AudioManager audioManager { get; set; }
+ private AudioManager audioManager { get; set; } = null!;
protected override bool Autoplay => true;
protected override TestPlayer CreatePlayer(Ruleset ruleset) => new ScoreExposedPlayer();
- protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard storyboard = null)
+ protected override WorkingBeatmap CreateWorkingBeatmap(IBeatmap beatmap, Storyboard? storyboard = null)
=> new ClockBackedTestWorkingBeatmap(beatmap, storyboard, new FramedClock(new ManualClock { Rate = 1 }), audioManager);
- private DrawableSpinner drawableSpinner;
+ private DrawableSpinner drawableSpinner = null!;
private SpriteIcon spinnerSymbol => drawableSpinner.ChildrenOfType().Single();
[SetUpSteps]
@@ -67,12 +64,12 @@ namespace osu.Game.Rulesets.Osu.Tests
{
trackerRotationTolerance = Math.Abs(drawableSpinner.RotationTracker.Rotation * 0.1f);
});
- AddAssert("is disc rotation not almost 0", () => !Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, 100));
- AddAssert("is disc rotation absolute not almost 0", () => !Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, 0, 100));
+ AddAssert("is disc rotation not almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.Not.EqualTo(0).Within(100));
+ AddAssert("is disc rotation absolute not almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.Not.EqualTo(0).Within(100));
addSeekStep(0);
- AddAssert("is disc rotation almost 0", () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, 0, trackerRotationTolerance));
- AddAssert("is disc rotation absolute almost 0", () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, 0, 100));
+ AddAssert("is disc rotation almost 0", () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(0).Within(trackerRotationTolerance));
+ AddAssert("is disc rotation absolute almost 0", () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(0).Within(100));
}
[Test]
@@ -100,20 +97,20 @@ namespace osu.Game.Rulesets.Osu.Tests
// we want to make sure that the rotation at time 2500 is in the same direction as at time 5000, but about half-way in.
// due to the exponential damping applied we're allowing a larger margin of error of about 10%
// (5% relative to the final rotation value, but we're half-way through the spin).
- () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalTrackerRotation / 2, trackerRotationTolerance));
+ () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation / 2).Within(trackerRotationTolerance));
AddAssert("symbol rotation rewound",
- () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation / 2, spinnerSymbolRotationTolerance));
+ () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation / 2).Within(spinnerSymbolRotationTolerance));
AddAssert("is cumulative rotation rewound",
// cumulative rotation is not damped, so we're treating it as the "ground truth" and allowing a comparatively smaller margin of error.
- () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, finalCumulativeTrackerRotation / 2, 100));
+ () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation / 2).Within(100));
addSeekStep(spinner_start_time + 5000);
AddAssert("is disc rotation almost same",
- () => Precision.AlmostEquals(drawableSpinner.RotationTracker.Rotation, finalTrackerRotation, trackerRotationTolerance));
+ () => drawableSpinner.RotationTracker.Rotation, () => Is.EqualTo(finalTrackerRotation).Within(trackerRotationTolerance));
AddAssert("is symbol rotation almost same",
- () => Precision.AlmostEquals(spinnerSymbol.Rotation, finalSpinnerSymbolRotation, spinnerSymbolRotationTolerance));
+ () => spinnerSymbol.Rotation, () => Is.EqualTo(finalSpinnerSymbolRotation).Within(spinnerSymbolRotationTolerance));
AddAssert("is cumulative rotation almost same",
- () => Precision.AlmostEquals(drawableSpinner.Result.RateAdjustedRotation, finalCumulativeTrackerRotation, 100));
+ () => drawableSpinner.Result.RateAdjustedRotation, () => Is.EqualTo(finalCumulativeTrackerRotation).Within(100));
}
[Test]
@@ -177,10 +174,10 @@ namespace osu.Game.Rulesets.Osu.Tests
AddStep("retrieve spm", () => estimatedSpm = drawableSpinner.SpinsPerMinute.Value);
addSeekStep(2000);
- AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
+ AddAssert("spm still valid", () => drawableSpinner.SpinsPerMinute.Value, () => Is.EqualTo(estimatedSpm).Within(1.0));
addSeekStep(1000);
- AddAssert("spm still valid", () => Precision.AlmostEquals(drawableSpinner.SpinsPerMinute.Value, estimatedSpm, 1.0));
+ AddAssert("spm still valid", () => drawableSpinner.SpinsPerMinute.Value, () => Is.EqualTo(estimatedSpm).Within(1.0));
}
[TestCase(0.5)]
@@ -202,14 +199,14 @@ namespace osu.Game.Rulesets.Osu.Tests
AddStep("adjust track rate", () => ((MasterGameplayClockContainer)Player.GameplayClockContainer).UserPlaybackRate.Value = rate);
addSeekStep(1000);
- AddAssert("progress almost same", () => Precision.AlmostEquals(expectedProgress, drawableSpinner.Progress, 0.05));
- AddAssert("spm almost same", () => Precision.AlmostEquals(expectedSpm, drawableSpinner.SpinsPerMinute.Value, 2.0));
+ AddAssert("progress almost same", () => expectedProgress, () => Is.EqualTo(drawableSpinner.Progress).Within(0.05));
+ AddAssert("spm almost same", () => expectedSpm, () => Is.EqualTo(drawableSpinner.SpinsPerMinute.Value).Within(2.0));
}
private void addSeekStep(double time)
{
AddStep($"seek to {time}", () => Player.GameplayClockContainer.Seek(time));
- AddUntilStep("wait for seek to finish", () => Precision.AlmostEquals(time, Player.DrawableRuleset.FrameStableClock.CurrentTime, 100));
+ AddUntilStep("wait for seek to finish", () => time, () => Is.EqualTo(Player.DrawableRuleset.FrameStableClock.CurrentTime).Within(100));
}
private void transformReplay(Func replayTransformation) => AddStep("set replay", () =>
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
index 76d5ccf682..6d1b4d1a15 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/AimEvaluator.cs
@@ -13,8 +13,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
public static class AimEvaluator
{
private const double wide_angle_multiplier = 1.5;
- private const double acute_angle_multiplier = 2.0;
- private const double slider_multiplier = 1.5;
+ private const double acute_angle_multiplier = 1.95;
+ private const double slider_multiplier = 1.35;
private const double velocity_change_multiplier = 0.75;
///
@@ -114,7 +114,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
velocityChangeBonus *= Math.Pow(Math.Min(osuCurrObj.StrainTime, osuLastObj.StrainTime) / Math.Max(osuCurrObj.StrainTime, osuLastObj.StrainTime), 2);
}
- if (osuLastObj.TravelTime != 0)
+ if (osuLastObj.BaseObject is Slider)
{
// Reward sliders based on velocity.
sliderBonus = osuLastObj.TravelDistance / osuLastObj.TravelTime;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
index 3b0826394c..fcf4179a3b 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Evaluators/FlashlightEvaluator.cs
@@ -15,11 +15,15 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
private const double max_opacity_bonus = 0.4;
private const double hidden_bonus = 0.2;
+ private const double min_velocity = 0.5;
+ private const double slider_multiplier = 1.3;
+
///
/// Evaluates the difficulty of memorising and hitting an object, based on:
///
- /// - distance between the previous and current object,
+ /// - distance between a number of previous objects and the current object,
/// - the visual opacity of the current object,
+ /// - length and speed of the current object (for sliders),
/// - and whether the hidden mod is enabled.
///
///
@@ -73,6 +77,26 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Evaluators
if (hidden)
result *= 1.0 + hidden_bonus;
+ double sliderBonus = 0.0;
+
+ if (osuCurrent.BaseObject is Slider osuSlider)
+ {
+ // Invert the scaling factor to determine the true travel distance independent of circle size.
+ double pixelTravelDistance = osuSlider.LazyTravelDistance / scalingFactor;
+
+ // Reward sliders based on velocity.
+ sliderBonus = Math.Pow(Math.Max(0.0, pixelTravelDistance / osuCurrent.TravelTime - min_velocity), 0.5);
+
+ // Longer sliders require more memorisation.
+ sliderBonus *= pixelTravelDistance;
+
+ // Nerf sliders with repeats, as less memorisation is required.
+ if (osuSlider.RepeatCount > 0)
+ sliderBonus /= (osuSlider.RepeatCount + 1);
+ }
+
+ result += sliderBonus * slider_multiplier;
+
return result;
}
}
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
index 9f4a405113..0ebfb9a283 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
@@ -46,7 +46,11 @@ namespace osu.Game.Rulesets.Osu.Difficulty
double sliderFactor = aimRating > 0 ? aimRatingNoSliders / aimRating : 1;
if (mods.Any(h => h is OsuModRelax))
+ {
+ aimRating *= 0.9;
speedRating = 0.0;
+ flashlightRating *= 0.7;
+ }
double baseAimPerformance = Math.Pow(5 * Math.Max(1, aimRating / 0.0675) - 4, 3) / 100000;
double baseSpeedPerformance = Math.Pow(5 * Math.Max(1, speedRating / 0.0675) - 4, 3) / 100000;
@@ -62,7 +66,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
Math.Pow(baseFlashlightPerformance, 1.1), 1.0 / 1.1
);
- double starRating = basePerformance > 0.00001 ? Math.Cbrt(1.12) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;
+ double starRating = basePerformance > 0.00001 ? Math.Cbrt(OsuPerformanceCalculator.PERFORMANCE_BASE_MULTIPLIER) * 0.027 * (Math.Cbrt(100000 / Math.Pow(2, 1 / 1.1) * basePerformance) + 4) : 0;
double preempt = IBeatmapDifficultyInfo.DifficultyRange(beatmap.Difficulty.ApproachRate, 1800, 1200, 450) / clockRate;
double drainRate = beatmap.Difficulty.DrainRate;
diff --git a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
index c3b7834009..3c82c2dc33 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
@@ -15,6 +15,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty
{
public class OsuPerformanceCalculator : PerformanceCalculator
{
+ public const double PERFORMANCE_BASE_MULTIPLIER = 1.14; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things.
+
private double accuracy;
private int scoreMaxCombo;
private int countGreat;
@@ -41,7 +43,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
countMiss = score.Statistics.GetValueOrDefault(HitResult.Miss);
effectiveMissCount = calculateEffectiveMissCount(osuAttributes);
- double multiplier = 1.12; // This is being adjusted to keep the final pp value scaled around what it used to be when changing things.
+ double multiplier = PERFORMANCE_BASE_MULTIPLIER;
if (score.Mods.Any(m => m is OsuModNoFail))
multiplier *= Math.Max(0.90, 1.0 - 0.02 * effectiveMissCount);
@@ -51,10 +53,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty
if (score.Mods.Any(h => h is OsuModRelax))
{
- // As we're adding Oks and Mehs to an approximated number of combo breaks the result can be higher than total hits in specific scenarios (which breaks some calculations) so we need to clamp it.
- effectiveMissCount = Math.Min(effectiveMissCount + countOk + countMeh, totalHits);
+ // https://www.desmos.com/calculator/bc9eybdthb
+ // we use OD13.3 as maximum since it's the value at which great hitwidow becomes 0
+ // this is well beyond currently maximum achievable OD which is 12.17 (DTx2 + DA with OD11)
+ double okMultiplier = Math.Max(0.0, osuAttributes.OverallDifficulty > 0.0 ? 1 - Math.Pow(osuAttributes.OverallDifficulty / 13.33, 1.8) : 1.0);
+ double mehMultiplier = Math.Max(0.0, osuAttributes.OverallDifficulty > 0.0 ? 1 - Math.Pow(osuAttributes.OverallDifficulty / 13.33, 5) : 1.0);
- multiplier *= 0.6;
+ // As we're adding Oks and Mehs to an approximated number of combo breaks the result can be higher than total hits in specific scenarios (which breaks some calculations) so we need to clamp it.
+ effectiveMissCount = Math.Min(effectiveMissCount + countOk * okMultiplier + countMeh * mehMultiplier, totalHits);
}
double aimValue = computeAimValue(score, osuAttributes);
@@ -103,7 +109,10 @@ namespace osu.Game.Rulesets.Osu.Difficulty
if (attributes.ApproachRate > 10.33)
approachRateFactor = 0.3 * (attributes.ApproachRate - 10.33);
else if (attributes.ApproachRate < 8.0)
- approachRateFactor = 0.1 * (8.0 - attributes.ApproachRate);
+ approachRateFactor = 0.05 * (8.0 - attributes.ApproachRate);
+
+ if (score.Mods.Any(h => h is OsuModRelax))
+ approachRateFactor = 0.0;
aimValue *= 1.0 + approachRateFactor * lengthBonus; // Buff for longer maps with high AR.
@@ -134,6 +143,9 @@ namespace osu.Game.Rulesets.Osu.Difficulty
private double computeSpeedValue(ScoreInfo score, OsuDifficultyAttributes attributes)
{
+ if (score.Mods.Any(h => h is OsuModRelax))
+ return 0.0;
+
double speedValue = Math.Pow(5.0 * Math.Max(1.0, attributes.SpeedDifficulty / 0.0675) - 4.0, 3.0) / 100000.0;
double lengthBonus = 0.95 + 0.4 * Math.Min(1.0, totalHits / 2000.0) +
@@ -174,7 +186,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty
speedValue *= (0.95 + Math.Pow(attributes.OverallDifficulty, 2) / 750) * Math.Pow((accuracy + relevantAccuracy) / 2.0, (14.5 - Math.Max(attributes.OverallDifficulty, 8)) / 2);
// Scale the speed value with # of 50s to punish doubletapping.
- speedValue *= Math.Pow(0.98, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
+ speedValue *= Math.Pow(0.99, countMeh < totalHits / 500.0 ? 0 : countMeh - totalHits / 500.0);
return speedValue;
}
@@ -266,6 +278,5 @@ namespace osu.Game.Rulesets.Osu.Difficulty
private double getComboScalingFactor(OsuDifficultyAttributes attributes) => attributes.MaxCombo <= 0 ? 1.0 : Math.Min(Math.Pow(scoreMaxCombo, 0.8) / Math.Pow(attributes.MaxCombo, 0.8), 1.0);
private int totalHits => countGreat + countOk + countMeh + countMiss;
- private int totalSuccessfulHits => countGreat + countOk + countMeh;
}
}
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
index c8646ec456..c7c5650184 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
@@ -15,10 +15,14 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
{
public class OsuDifficultyHitObject : DifficultyHitObject
{
- private const int normalised_radius = 50; // Change radius to 50 to make 100 the diameter. Easier for mental maths.
+ ///
+ /// A distance by which all distances should be scaled in order to assume a uniform circle size.
+ ///
+ public const int NORMALISED_RADIUS = 50; // Change radius to 50 to make 100 the diameter. Easier for mental maths.
+
private const int min_delta_time = 25;
- private const float maximum_slider_radius = normalised_radius * 2.4f;
- private const float assumed_slider_radius = normalised_radius * 1.8f;
+ private const float maximum_slider_radius = NORMALISED_RADIUS * 2.4f;
+ private const float assumed_slider_radius = NORMALISED_RADIUS * 1.8f;
protected new OsuHitObject BaseObject => (OsuHitObject)base.BaseObject;
@@ -64,7 +68,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
public double TravelDistance { get; private set; }
///
- /// The time taken to travel through , with a minimum value of 25ms for a non-zero distance.
+ /// The time taken to travel through , with a minimum value of 25ms for objects.
///
public double TravelTime { get; private set; }
@@ -123,7 +127,8 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
if (BaseObject is Slider currentSlider)
{
computeSliderCursorPosition(currentSlider);
- TravelDistance = currentSlider.LazyTravelDistance;
+ // Bonus for repeat sliders until a better per nested object strain system can be achieved.
+ TravelDistance = currentSlider.LazyTravelDistance * (float)Math.Pow(1 + currentSlider.RepeatCount / 2.5, 1.0 / 2.5);
TravelTime = Math.Max(currentSlider.LazyTravelTime / clockRate, min_delta_time);
}
@@ -132,7 +137,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
return;
// We will scale distances by this factor, so we can assume a uniform CircleSize among beatmaps.
- float scalingFactor = normalised_radius / (float)BaseObject.Radius;
+ float scalingFactor = NORMALISED_RADIUS / (float)BaseObject.Radius;
if (BaseObject.Radius < 30)
{
@@ -206,7 +211,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
slider.LazyEndPosition = slider.StackedPosition + slider.Path.PositionAt(endTimeMin); // temporary lazy end position until a real result can be derived.
var currCursorPosition = slider.StackedPosition;
- double scalingFactor = normalised_radius / slider.Radius; // lazySliderDistance is coded to be sensitive to scaling, this makes the maths easier with the thresholds being used.
+ double scalingFactor = NORMALISED_RADIUS / slider.Radius; // lazySliderDistance is coded to be sensitive to scaling, this makes the maths easier with the thresholds being used.
for (int i = 1; i < slider.NestedHitObjects.Count; i++)
{
@@ -234,7 +239,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
else if (currMovementObj is SliderRepeat)
{
// For a slider repeat, assume a tighter movement threshold to better assess repeat sliders.
- requiredMovement = normalised_radius;
+ requiredMovement = NORMALISED_RADIUS;
}
if (currMovementLength > requiredMovement)
@@ -248,8 +253,6 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Preprocessing
if (i == slider.NestedHitObjects.Count - 1)
slider.LazyEndPosition = currCursorPosition;
}
-
- slider.LazyTravelDistance *= (float)Math.Pow(1 + slider.RepeatCount / 2.5, 1.0 / 2.5); // Bonus for repeat sliders until a better per nested object strain system can be achieved.
}
private Vector2 getEndCursorPosition(OsuHitObject hitObject)
diff --git a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
index 9b1fbf9a2e..38e0e5b677 100644
--- a/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
+++ b/osu.Game.Rulesets.Osu/Difficulty/Skills/Aim.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Osu.Difficulty.Skills
private double currentStrain;
- private double skillMultiplier => 23.25;
+ private double skillMultiplier => 23.55;
private double strainDecayBase => 0.15;
private double strainDecay(double ms) => Math.Pow(strainDecayBase, ms / 1000);
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
index 872fcf7e9b..9229c0393d 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModAutopilot.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override IconUsage? Icon => OsuIcon.ModAutopilot;
public override ModType Type => ModType.Automation;
public override string Description => @"Automatic cursor movement - just follow the rhythm.";
- public override double ScoreMultiplier => 1;
+ public override double ScoreMultiplier => 0.1;
public override Type[] IncompatibleMods => new[] { typeof(OsuModSpunOut), typeof(ModRelax), typeof(ModFailCondition), typeof(ModNoFail), typeof(ModAutoplay), typeof(OsuModMagnetised), typeof(OsuModRepel) };
public bool PerformFail() => false;
diff --git a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
index 9316f9ed74..7f7d6f70d2 100644
--- a/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
+++ b/osu.Game.Rulesets.Osu/Mods/OsuModMagnetised.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Rulesets.Osu.Mods
public override IconUsage? Icon => FontAwesome.Solid.Magnet;
public override ModType Type => ModType.Fun;
public override string Description => "No need to chase the circles – your cursor is a magnet!";
- public override double ScoreMultiplier => 1;
+ public override double ScoreMultiplier => 0.5;
public override Type[] IncompatibleMods => new[] { typeof(OsuModAutopilot), typeof(OsuModWiggle), typeof(OsuModTransform), typeof(ModAutoplay), typeof(OsuModRelax), typeof(OsuModRepel) };
private IFrameStableClock gameplayClock = null!;
diff --git a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
index f9ed8b8721..554ea3ac90 100644
--- a/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
+++ b/osu.Game.Rulesets.Osu/Skinning/Default/SpinnerRotationTracker.cs
@@ -59,7 +59,7 @@ namespace osu.Game.Rulesets.Osu.Skinning.Default
private bool rotationTransferred;
[Resolved(canBeNull: true)]
- private GameplayClock gameplayClock { get; set; }
+ private IGameplayClock gameplayClock { get; set; }
protected override void Update()
{
diff --git a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
index c2df9e5e09..0e80f8f699 100644
--- a/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
+++ b/osu.Game.Tests/Editing/TestSceneHitObjectComposerDistanceSnapping.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Tests.Editing
}
private void assertSnapDistance(float expectedDistance, HitObject hitObject = null)
- => AddAssert($"distance is {expectedDistance}", () => composer.GetBeatSnapDistanceAt(hitObject ?? new HitObject()) == expectedDistance);
+ => AddAssert($"distance is {expectedDistance}", () => composer.GetBeatSnapDistanceAt(hitObject ?? new HitObject()), () => Is.EqualTo(expectedDistance));
private void assertDurationToDistance(double duration, float expectedDistance)
=> AddAssert($"duration = {duration} -> distance = {expectedDistance}", () => composer.DurationToDistance(new HitObject(), duration) == expectedDistance);
diff --git a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
index 5f403f9487..abd734b96c 100644
--- a/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneMasterGameplayClockContainer.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Tests.Gameplay
});
AddStep("start clock", () => gameplayClockContainer.Start());
- AddUntilStep("elapsed greater than zero", () => gameplayClockContainer.GameplayClock.ElapsedFrameTime > 0);
+ AddUntilStep("elapsed greater than zero", () => gameplayClockContainer.ElapsedFrameTime > 0);
}
[Test]
@@ -60,16 +60,16 @@ namespace osu.Game.Tests.Gameplay
});
AddStep("start clock", () => gameplayClockContainer.Start());
- AddUntilStep("current time greater 2000", () => gameplayClockContainer.GameplayClock.CurrentTime > 2000);
+ AddUntilStep("current time greater 2000", () => gameplayClockContainer.CurrentTime > 2000);
double timeAtReset = 0;
AddStep("reset clock", () =>
{
- timeAtReset = gameplayClockContainer.GameplayClock.CurrentTime;
+ timeAtReset = gameplayClockContainer.CurrentTime;
gameplayClockContainer.Reset();
});
- AddAssert("current time < time at reset", () => gameplayClockContainer.GameplayClock.CurrentTime < timeAtReset);
+ AddAssert("current time < time at reset", () => gameplayClockContainer.CurrentTime < timeAtReset);
}
[Test]
diff --git a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
index f05244ab88..18ae2cb7c8 100644
--- a/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
+++ b/osu.Game.Tests/Gameplay/TestSceneStoryboardSamples.cs
@@ -77,7 +77,6 @@ namespace osu.Game.Tests.Gameplay
Add(gameplayContainer = new MasterGameplayClockContainer(working, 0)
{
- IsPaused = { Value = true },
Child = new FrameStabilityContainer
{
Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
@@ -106,7 +105,6 @@ namespace osu.Game.Tests.Gameplay
Add(gameplayContainer = new MasterGameplayClockContainer(working, start_time)
{
StartTime = start_time,
- IsPaused = { Value = true },
Child = new FrameStabilityContainer
{
Child = sample = new DrawableStoryboardSample(new StoryboardSampleInfo(string.Empty, 0, 1))
@@ -141,7 +139,7 @@ namespace osu.Game.Tests.Gameplay
beatmapSkinSourceContainer.Add(sample = new TestDrawableStoryboardSample(new StoryboardSampleInfo("test-sample", 1, 1))
{
- Clock = gameplayContainer.GameplayClock
+ Clock = gameplayContainer
});
});
diff --git a/osu.Game.Tests/NonVisual/BeatmapSetInfoEqualityTest.cs b/osu.Game.Tests/NonVisual/BeatmapSetInfoEqualityTest.cs
index 461102124a..a229331ef0 100644
--- a/osu.Game.Tests/NonVisual/BeatmapSetInfoEqualityTest.cs
+++ b/osu.Game.Tests/NonVisual/BeatmapSetInfoEqualityTest.cs
@@ -36,6 +36,23 @@ namespace osu.Game.Tests.NonVisual
Assert.IsTrue(beatmapSetA.Beatmaps.Single().AudioEquals(beatmapSetB.Beatmaps.Single()));
}
+ [Test]
+ public void TestAudioEqualityCaseSensitivity()
+ {
+ var beatmapSetA = TestResources.CreateTestBeatmapSetInfo(1);
+ var beatmapSetB = TestResources.CreateTestBeatmapSetInfo(1);
+
+ // empty by default so let's set it..
+ beatmapSetA.Beatmaps.First().Metadata.AudioFile = "audio.mp3";
+ beatmapSetB.Beatmaps.First().Metadata.AudioFile = "audio.mp3";
+
+ addAudioFile(beatmapSetA, "abc", "AuDiO.mP3");
+ addAudioFile(beatmapSetB, "abc", "audio.mp3");
+
+ Assert.AreNotEqual(beatmapSetA, beatmapSetB);
+ Assert.IsTrue(beatmapSetA.Beatmaps.Single().AudioEquals(beatmapSetB.Beatmaps.Single()));
+ }
+
[Test]
public void TestAudioEqualitySameHash()
{
diff --git a/osu.Game.Tests/NonVisual/GameplayClockTest.cs b/osu.Game.Tests/NonVisual/GameplayClockTest.cs
index 5b8aacd281..162734f9da 100644
--- a/osu.Game.Tests/NonVisual/GameplayClockTest.cs
+++ b/osu.Game.Tests/NonVisual/GameplayClockTest.cs
@@ -4,6 +4,7 @@
#nullable disable
using System.Collections.Generic;
+using System.Linq;
using NUnit.Framework;
using osu.Framework.Bindables;
using osu.Framework.Timing;
@@ -30,7 +31,7 @@ namespace osu.Game.Tests.NonVisual
{
public List> MutableNonGameplayAdjustments { get; } = new List>();
- public override IEnumerable> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+ public override IEnumerable NonGameplayAdjustments => MutableNonGameplayAdjustments.Select(b => b.Value);
public TestGameplayClock(IFrameBasedClock underlyingClock)
: base(underlyingClock)
diff --git a/osu.Game.Tests/Resources/TestResources.cs b/osu.Game.Tests/Resources/TestResources.cs
index ee29cc8644..6bce03869d 100644
--- a/osu.Game.Tests/Resources/TestResources.cs
+++ b/osu.Game.Tests/Resources/TestResources.cs
@@ -128,6 +128,8 @@ namespace osu.Game.Tests.Resources
var rulesetInfo = getRuleset();
+ string hash = Guid.NewGuid().ToString().ComputeMD5Hash();
+
yield return new BeatmapInfo
{
OnlineID = beatmapId,
@@ -136,7 +138,8 @@ namespace osu.Game.Tests.Resources
Length = length,
BeatmapSet = beatmapSet,
BPM = bpm,
- Hash = Guid.NewGuid().ToString().ComputeMD5Hash(),
+ Hash = hash,
+ MD5Hash = hash,
Ruleset = rulesetInfo,
Metadata = metadata.DeepClone(),
Difficulty = new BeatmapDifficulty
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
index 3be6371f28..3c6820e49b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorClock.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
@@ -59,15 +57,15 @@ namespace osu.Game.Tests.Visual.Editing
{
AddStep("reset clock", () => Clock.Seek(0));
- AddStep("start clock", Clock.Start);
+ AddStep("start clock", () => Clock.Start());
AddAssert("clock running", () => Clock.IsRunning);
AddStep("seek near end", () => Clock.Seek(Clock.TrackLength - 250));
AddUntilStep("clock stops", () => !Clock.IsRunning);
- AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+ AddUntilStep("clock stopped at end", () => Clock.CurrentTime, () => Is.EqualTo(Clock.TrackLength));
- AddStep("start clock again", Clock.Start);
+ AddStep("start clock again", () => Clock.Start());
AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
}
@@ -76,32 +74,32 @@ namespace osu.Game.Tests.Visual.Editing
{
AddStep("reset clock", () => Clock.Seek(0));
- AddStep("stop clock", Clock.Stop);
+ AddStep("stop clock", () => Clock.Stop());
AddAssert("clock stopped", () => !Clock.IsRunning);
AddStep("seek exactly to end", () => Clock.Seek(Clock.TrackLength));
- AddAssert("clock stopped at end", () => Clock.CurrentTime == Clock.TrackLength);
+ AddAssert("clock stopped at end", () => Clock.CurrentTime, () => Is.EqualTo(Clock.TrackLength));
- AddStep("start clock again", Clock.Start);
+ AddStep("start clock again", () => Clock.Start());
AddAssert("clock looped to start", () => Clock.IsRunning && Clock.CurrentTime < 500);
}
[Test]
public void TestClampWhenSeekOutsideBeatmapBounds()
{
- AddStep("stop clock", Clock.Stop);
+ AddStep("stop clock", () => Clock.Stop());
AddStep("seek before start time", () => Clock.Seek(-1000));
- AddAssert("time is clamped to 0", () => Clock.CurrentTime == 0);
+ AddAssert("time is clamped to 0", () => Clock.CurrentTime, () => Is.EqualTo(0));
AddStep("seek beyond track length", () => Clock.Seek(Clock.TrackLength + 1000));
- AddAssert("time is clamped to track length", () => Clock.CurrentTime == Clock.TrackLength);
+ AddAssert("time is clamped to track length", () => Clock.CurrentTime, () => Is.EqualTo(Clock.TrackLength));
AddStep("seek smoothly before start time", () => Clock.SeekSmoothlyTo(-1000));
- AddAssert("time is clamped to 0", () => Clock.CurrentTime == 0);
+ AddUntilStep("time is clamped to 0", () => Clock.CurrentTime, () => Is.EqualTo(0));
AddStep("seek smoothly beyond track length", () => Clock.SeekSmoothlyTo(Clock.TrackLength + 1000));
- AddAssert("time is clamped to track length", () => Clock.CurrentTime == Clock.TrackLength);
+ AddUntilStep("time is clamped to track length", () => Clock.CurrentTime, () => Is.EqualTo(Clock.TrackLength));
}
protected override void Dispose(bool isDisposing)
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
index c8ca273db5..d24baa6f63 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeekSnapping.cs
@@ -60,17 +60,17 @@ namespace osu.Game.Tests.Visual.Editing
// Forwards
AddStep("Seek(0)", () => Clock.Seek(0));
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
AddStep("Seek(33)", () => Clock.Seek(33));
- AddAssert("Time = 33", () => Clock.CurrentTime == 33);
+ checkTime(33);
AddStep("Seek(89)", () => Clock.Seek(89));
- AddAssert("Time = 89", () => Clock.CurrentTime == 89);
+ checkTime(89);
// Backwards
AddStep("Seek(25)", () => Clock.Seek(25));
- AddAssert("Time = 25", () => Clock.CurrentTime == 25);
+ checkTime(25);
AddStep("Seek(0)", () => Clock.Seek(0));
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
}
///
@@ -83,19 +83,19 @@ namespace osu.Game.Tests.Visual.Editing
reset();
AddStep("Seek(0), Snap", () => Clock.SeekSnapped(0));
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
AddStep("Seek(50), Snap", () => Clock.SeekSnapped(50));
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("Seek(100), Snap", () => Clock.SeekSnapped(100));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("Seek(175), Snap", () => Clock.SeekSnapped(175));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("Seek(350), Snap", () => Clock.SeekSnapped(350));
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
AddStep("Seek(400), Snap", () => Clock.SeekSnapped(400));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("Seek(450), Snap", () => Clock.SeekSnapped(450));
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
}
///
@@ -108,17 +108,17 @@ namespace osu.Game.Tests.Visual.Editing
reset();
AddStep("Seek(24), Snap", () => Clock.SeekSnapped(24));
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
AddStep("Seek(26), Snap", () => Clock.SeekSnapped(26));
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("Seek(150), Snap", () => Clock.SeekSnapped(150));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("Seek(170), Snap", () => Clock.SeekSnapped(170));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("Seek(274), Snap", () => Clock.SeekSnapped(274));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("Seek(276), Snap", () => Clock.SeekSnapped(276));
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
}
///
@@ -130,15 +130,15 @@ namespace osu.Game.Tests.Visual.Editing
reset();
AddStep("SeekForward", () => Clock.SeekForward());
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("SeekForward", () => Clock.SeekForward());
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("SeekForward", () => Clock.SeekForward());
- AddAssert("Time = 200", () => Clock.CurrentTime == 200);
+ checkTime(200);
AddStep("SeekForward", () => Clock.SeekForward());
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("SeekForward", () => Clock.SeekForward());
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
}
///
@@ -150,17 +150,17 @@ namespace osu.Game.Tests.Visual.Editing
reset();
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
}
///
@@ -174,28 +174,28 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("Seek(49)", () => Clock.Seek(49));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("Seek(49.999)", () => Clock.Seek(49.999));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("Seek(99)", () => Clock.Seek(99));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("Seek(99.999)", () => Clock.Seek(99.999));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 100", () => Clock.CurrentTime == 150);
+ checkTime(150);
AddStep("Seek(174)", () => Clock.Seek(174));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("Seek(349)", () => Clock.Seek(349));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
AddStep("Seek(399)", () => Clock.Seek(399));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("Seek(449)", () => Clock.Seek(449));
AddStep("SeekForward, Snap", () => Clock.SeekForward(true));
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
}
///
@@ -208,15 +208,15 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("Seek(450)", () => Clock.Seek(450));
AddStep("SeekBackward", () => Clock.SeekBackward());
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("SeekBackward", () => Clock.SeekBackward());
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
AddStep("SeekBackward", () => Clock.SeekBackward());
- AddAssert("Time = 150", () => Clock.CurrentTime == 150);
+ checkTime(150);
AddStep("SeekBackward", () => Clock.SeekBackward());
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("SeekBackward", () => Clock.SeekBackward());
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
}
///
@@ -229,17 +229,17 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("Seek(450)", () => Clock.Seek(450));
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 350", () => Clock.CurrentTime == 350);
+ checkTime(350);
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 175", () => Clock.CurrentTime == 175);
+ checkTime(175);
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 100", () => Clock.CurrentTime == 100);
+ checkTime(100);
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 50", () => Clock.CurrentTime == 50);
+ checkTime(50);
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
}
///
@@ -253,16 +253,16 @@ namespace osu.Game.Tests.Visual.Editing
AddStep("Seek(451)", () => Clock.Seek(451));
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
AddStep("Seek(450.999)", () => Clock.Seek(450.999));
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 450", () => Clock.CurrentTime == 450);
+ checkTime(450);
AddStep("Seek(401)", () => Clock.Seek(401));
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
AddStep("Seek(401.999)", () => Clock.Seek(401.999));
AddStep("SeekBackward, Snap", () => Clock.SeekBackward(true));
- AddAssert("Time = 400", () => Clock.CurrentTime == 400);
+ checkTime(400);
}
///
@@ -297,9 +297,11 @@ namespace osu.Game.Tests.Visual.Editing
AddAssert("Time < lastTime", () => Clock.CurrentTime < lastTime);
}
- AddAssert("Time = 0", () => Clock.CurrentTime == 0);
+ checkTime(0);
}
+ private void checkTime(double expectedTime) => AddAssert($"Current time is {expectedTime}", () => Clock.CurrentTime, () => Is.EqualTo(expectedTime));
+
private void reset()
{
AddStep("Reset", () => Clock.Seek(0));
diff --git a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
index 6f248f1247..924396ce03 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneEditorSeeking.cs
@@ -4,7 +4,6 @@
#nullable disable
using NUnit.Framework;
-using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets;
@@ -120,7 +119,7 @@ namespace osu.Game.Tests.Visual.Editing
private void pressAndCheckTime(Key key, double expectedTime)
{
AddStep($"press {key}", () => InputManager.Key(key));
- AddUntilStep($"time is {expectedTime}", () => Precision.AlmostEquals(expectedTime, EditorClock.CurrentTime, 1));
+ AddUntilStep($"time is {expectedTime}", () => EditorClock.CurrentTime, () => Is.EqualTo(expectedTime).Within(1));
}
}
}
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
index d4f3d0f390..d6c49b026e 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapSkinFallbacks.cs
@@ -80,7 +80,7 @@ namespace osu.Game.Tests.Visual.Gameplay
(typeof(ScoreProcessor), actualComponentsContainer.Dependencies.Get()),
(typeof(HealthProcessor), actualComponentsContainer.Dependencies.Get()),
(typeof(GameplayState), actualComponentsContainer.Dependencies.Get()),
- (typeof(GameplayClock), actualComponentsContainer.Dependencies.Get())
+ (typeof(IGameplayClock), actualComponentsContainer.Dependencies.Get())
},
};
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
index 97ffbfc796..ef74024b4b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneFrameStabilityContainer.cs
@@ -137,13 +137,13 @@ namespace osu.Game.Tests.Visual.Gameplay
private void seekManualTo(double time) => AddStep($"seek manual clock to {time}", () => manualClock.CurrentTime = time);
- private void confirmSeek(double time) => AddUntilStep($"wait for seek to {time}", () => consumer.Clock.CurrentTime == time);
+ private void confirmSeek(double time) => AddUntilStep($"wait for seek to {time}", () => consumer.Clock.CurrentTime, () => Is.EqualTo(time));
private void checkFrameCount(int frames) =>
- AddAssert($"elapsed frames is {frames}", () => consumer.ElapsedFrames == frames);
+ AddAssert($"elapsed frames is {frames}", () => consumer.ElapsedFrames, () => Is.EqualTo(frames));
private void checkRate(double rate) =>
- AddAssert($"clock rate is {rate}", () => consumer.Clock.Rate == rate);
+ AddAssert($"clock rate is {rate}", () => consumer.Clock.Rate, () => Is.EqualTo(rate));
public class ClockConsumingChild : CompositeDrawable
{
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
index f1084bca5f..1fe2dfd4df 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneGameplaySamplePlayback.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
@@ -21,22 +19,22 @@ namespace osu.Game.Tests.Visual.Gameplay
[Test]
public void TestAllSamplesStopDuringSeek()
{
- DrawableSlider slider = null;
- PoolableSkinnableSample[] samples = null;
- ISamplePlaybackDisabler sampleDisabler = null;
+ DrawableSlider? slider = null;
+ PoolableSkinnableSample[] samples = null!;
+ ISamplePlaybackDisabler sampleDisabler = null!;
AddUntilStep("get variables", () =>
{
sampleDisabler = Player;
slider = Player.ChildrenOfType().MinBy(s => s.HitObject.StartTime);
- samples = slider?.ChildrenOfType().ToArray();
+ samples = slider.ChildrenOfType().ToArray();
return slider != null;
});
AddUntilStep("wait for slider sliding then seek", () =>
{
- if (!slider.Tracking.Value)
+ if (slider?.Tracking.Value != true)
return false;
if (!samples.Any(s => s.Playing))
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
index fb97f94dbb..3e2698bc05 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneHUDOverlay.cs
@@ -38,8 +38,8 @@ namespace osu.Game.Tests.Visual.Gameplay
[Cached]
private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
- [Cached]
- private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+ [Cached(typeof(IGameplayClock))]
+ private readonly IGameplayClock gameplayClock = new GameplayClock(new FramedClock());
// best way to check without exposing.
private Drawable hideTarget => hudOverlay.KeyCounter;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
index 7f4276f819..0d80d29cab 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneLeadIn.cs
@@ -130,7 +130,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public double FirstHitObjectTime => DrawableRuleset.Objects.First().StartTime;
- public double GameplayClockTime => GameplayClockContainer.GameplayClock.CurrentTime;
+ public double GameplayClockTime => GameplayClockContainer.CurrentTime;
protected override void UpdateAfterChildren()
{
@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual.Gameplay
if (!FirstFrameClockTime.HasValue)
{
- FirstFrameClockTime = GameplayClockContainer.GameplayClock.CurrentTime;
+ FirstFrameClockTime = GameplayClockContainer.CurrentTime;
AddInternal(new OsuSpriteText
{
Text = $"GameplayStartTime: {DrawableRuleset.GameplayStartTime} "
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
index 3e637f1870..789e7e770f 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneOverlayActivation.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Tests.Visual.Gameplay
base.SetUpSteps();
AddUntilStep("gameplay has started",
- () => Player.GameplayClockContainer.GameplayClock.CurrentTime > Player.DrawableRuleset.GameplayStartTime);
+ () => Player.GameplayClockContainer.CurrentTime > Player.DrawableRuleset.GameplayStartTime);
}
[Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
index 71cc1f7b23..cad8c62233 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePause.cs
@@ -313,7 +313,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("pause again", () =>
{
Player.Pause();
- return !Player.GameplayClockContainer.GameplayClock.IsRunning;
+ return !Player.GameplayClockContainer.IsRunning;
});
AddAssert("loop is playing", () => getLoop().IsPlaying);
@@ -378,7 +378,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("pause overlay " + (isShown ? "shown" : "hidden"), () => Player.PauseOverlayVisible == isShown);
private void confirmClockRunning(bool isRunning) =>
- AddUntilStep("clock " + (isRunning ? "running" : "stopped"), () => Player.GameplayClockContainer.GameplayClock.IsRunning == isRunning);
+ AddUntilStep("clock " + (isRunning ? "running" : "stopped"), () => Player.GameplayClockContainer.IsRunning == isRunning);
protected override bool AllowFail => true;
diff --git a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
index 05474e3d39..dbbedf37ae 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestScenePlayerLoader.cs
@@ -56,6 +56,10 @@ namespace osu.Game.Tests.Visual.Gameplay
private readonly ChangelogOverlay changelogOverlay;
+ private double savedTrackVolume;
+ private double savedMasterVolume;
+ private bool savedMutedState;
+
public TestScenePlayerLoader()
{
AddRange(new Drawable[]
@@ -75,11 +79,7 @@ namespace osu.Game.Tests.Visual.Gameplay
}
[SetUp]
- public void Setup() => Schedule(() =>
- {
- player = null;
- audioManager.Volume.SetDefault();
- });
+ public void Setup() => Schedule(() => player = null);
///
/// Sets the input manager child to a new test player loader container instance.
@@ -147,6 +147,7 @@ namespace osu.Game.Tests.Visual.Gameplay
moveMouse();
return player?.LoadState == LoadState.Ready;
});
+
AddRepeatStep("move mouse", moveMouse, 20);
AddAssert("loader still active", () => loader.IsCurrentScreen());
@@ -154,6 +155,8 @@ namespace osu.Game.Tests.Visual.Gameplay
void moveMouse()
{
+ notificationOverlay.State.Value = Visibility.Hidden;
+
InputManager.MoveMouseTo(
loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft
+ (loader.VisualSettings.ScreenSpaceDrawQuad.BottomRight - loader.VisualSettings.ScreenSpaceDrawQuad.TopLeft)
@@ -274,6 +277,8 @@ namespace osu.Game.Tests.Visual.Gameplay
AddStep("load player", () => resetPlayer(false, beforeLoad));
AddUntilStep("wait for player", () => player?.LoadState == LoadState.Ready);
+ saveVolumes();
+
AddAssert("check for notification", () => notificationOverlay.UnreadCount.Value == 1);
AddStep("click notification", () =>
{
@@ -287,6 +292,8 @@ namespace osu.Game.Tests.Visual.Gameplay
AddAssert("check " + volumeName, assert);
+ restoreVolumes();
+
AddUntilStep("wait for player load", () => player.IsLoaded);
}
@@ -294,6 +301,9 @@ namespace osu.Game.Tests.Visual.Gameplay
[TestCase(false)]
public void TestEpilepsyWarning(bool warning)
{
+ saveVolumes();
+ setFullVolume();
+
AddStep("change epilepsy warning", () => epilepsyWarning = warning);
AddStep("load dummy beatmap", () => resetPlayer(false));
@@ -306,6 +316,30 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("sound volume decreased", () => Beatmap.Value.Track.AggregateVolume.Value == 0.25);
AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
}
+
+ restoreVolumes();
+ }
+
+ [Test]
+ public void TestEpilepsyWarningEarlyExit()
+ {
+ saveVolumes();
+ setFullVolume();
+
+ AddStep("set epilepsy warning", () => epilepsyWarning = true);
+ AddStep("load dummy beatmap", () => resetPlayer(false));
+
+ AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+
+ AddUntilStep("wait for epilepsy warning", () => getWarning().Alpha > 0);
+ AddUntilStep("warning is shown", () => getWarning().State.Value == Visibility.Visible);
+
+ AddStep("exit early", () => loader.Exit());
+
+ AddUntilStep("warning is hidden", () => getWarning().State.Value == Visibility.Hidden);
+ AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
+
+ restoreVolumes();
}
[TestCase(true, 1.0, false)] // on battery, above cutoff --> no warning
@@ -336,21 +370,34 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("wait for player load", () => player.IsLoaded);
}
- [Test]
- public void TestEpilepsyWarningEarlyExit()
+ private void restoreVolumes()
{
- AddStep("set epilepsy warning", () => epilepsyWarning = true);
- AddStep("load dummy beatmap", () => resetPlayer(false));
+ AddStep("restore previous volumes", () =>
+ {
+ audioManager.VolumeTrack.Value = savedTrackVolume;
+ audioManager.Volume.Value = savedMasterVolume;
+ volumeOverlay.IsMuted.Value = savedMutedState;
+ });
+ }
- AddUntilStep("wait for current", () => loader.IsCurrentScreen());
+ private void setFullVolume()
+ {
+ AddStep("set volumes to 100%", () =>
+ {
+ audioManager.VolumeTrack.Value = 1;
+ audioManager.Volume.Value = 1;
+ volumeOverlay.IsMuted.Value = false;
+ });
+ }
- AddUntilStep("wait for epilepsy warning", () => getWarning().Alpha > 0);
- AddUntilStep("warning is shown", () => getWarning().State.Value == Visibility.Visible);
-
- AddStep("exit early", () => loader.Exit());
-
- AddUntilStep("warning is hidden", () => getWarning().State.Value == Visibility.Hidden);
- AddUntilStep("sound volume restored", () => Beatmap.Value.Track.AggregateVolume.Value == 1);
+ private void saveVolumes()
+ {
+ AddStep("save previous volumes", () =>
+ {
+ savedTrackVolume = audioManager.VolumeTrack.Value;
+ savedMasterVolume = audioManager.Volume.Value;
+ savedMutedState = volumeOverlay.IsMuted.Value;
+ });
}
private EpilepsyWarning getWarning() => loader.ChildrenOfType().SingleOrDefault();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
index 3eb92b3e97..e29101ba8d 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinEditorMultipleSkins.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Tests.Visual.Gameplay
[Cached]
private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
- [Cached]
- private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+ [Cached(typeof(IGameplayClock))]
+ private readonly IGameplayClock gameplayClock = new GameplayClock(new FramedClock());
[SetUpSteps]
public void SetUpSteps()
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
index ee2827122d..00e4171eac 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableHUDOverlay.cs
@@ -36,8 +36,8 @@ namespace osu.Game.Tests.Visual.Gameplay
[Cached]
private GameplayState gameplayState = TestGameplayState.Create(new OsuRuleset());
- [Cached]
- private readonly GameplayClock gameplayClock = new GameplayClock(new FramedClock());
+ [Cached(typeof(IGameplayClock))]
+ private readonly IGameplayClock gameplayClock = new GameplayClock(new FramedClock());
private IEnumerable hudOverlays => CreatedDrawables.OfType();
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
index 5c73db15df..b6b3650c83 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSkipOverlay.cs
@@ -6,6 +6,7 @@
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
+using osu.Framework.Timing;
using osu.Game.Rulesets.Osu;
using osu.Game.Screens.Play;
using osuTK;
@@ -22,7 +23,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private double increment;
private GameplayClockContainer gameplayClockContainer;
- private GameplayClock gameplayClock;
+ private IFrameBasedClock gameplayClock;
private const double skip_time = 6000;
@@ -51,7 +52,7 @@ namespace osu.Game.Tests.Visual.Gameplay
};
gameplayClockContainer.Start();
- gameplayClock = gameplayClockContainer.GameplayClock;
+ gameplayClock = gameplayClockContainer;
});
[Test]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
index 9eb71b9cf7..3487f4dbff 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSongProgress.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual.Gameplay
Add(gameplayClockContainer = new MasterGameplayClockContainer(Beatmap.Value, skip_target_time));
- Dependencies.CacheAs(gameplayClockContainer.GameplayClock);
+ Dependencies.CacheAs(gameplayClockContainer);
}
[SetUpSteps]
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
index a42e86933f..0aa412a4fd 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneSpectator.cs
@@ -363,7 +363,7 @@ namespace osu.Game.Tests.Visual.Gameplay
private Player player => Stack.CurrentScreen as Player;
private double currentFrameStableTime
- => player.ChildrenOfType().First().FrameStableClock.CurrentTime;
+ => player.ChildrenOfType().First().CurrentTime;
private void waitForPlayer() => AddUntilStep("wait for player", () => (Stack.CurrentScreen as Player)?.IsLoaded == true);
diff --git a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
index e2b2ad85a3..e2c825df0b 100644
--- a/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
+++ b/osu.Game.Tests/Visual/Gameplay/TestSceneStoryboardWithOutro.cs
@@ -64,7 +64,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestStoryboardNoSkipOutro()
{
CreateTest();
- AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+ AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
AddUntilStep("wait for score shown", () => Player.IsScoreShown);
}
@@ -100,7 +100,7 @@ namespace osu.Game.Tests.Visual.Gameplay
});
AddUntilStep("wait for fail", () => Player.GameplayState.HasFailed);
- AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+ AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
AddUntilStep("wait for fail overlay", () => Player.FailOverlay.State.Value == Visibility.Visible);
}
@@ -111,7 +111,7 @@ namespace osu.Game.Tests.Visual.Gameplay
{
AddStep("set ShowResults = false", () => showResults = false);
});
- AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+ AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
AddWaitStep("wait", 10);
AddAssert("no score shown", () => !Player.IsScoreShown);
}
@@ -120,7 +120,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public void TestStoryboardEndsBeforeCompletion()
{
CreateTest(() => AddStep("set storyboard duration to .1s", () => currentStoryboardDuration = 100));
- AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+ AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
AddUntilStep("completion set by processor", () => Player.ScoreProcessor.HasCompleted.Value);
AddUntilStep("wait for score shown", () => Player.IsScoreShown);
}
@@ -138,7 +138,7 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("skip overlay content not visible", () => fadeContainer().State == Visibility.Hidden);
AddUntilStep("skip overlay content becomes visible", () => fadeContainer().State == Visibility.Visible);
- AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.GameplayClock.CurrentTime >= currentStoryboardDuration);
+ AddUntilStep("storyboard ends", () => Player.GameplayClockContainer.CurrentTime >= currentStoryboardDuration);
}
[Test]
diff --git a/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs b/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs
new file mode 100644
index 0000000000..2901501b30
--- /dev/null
+++ b/osu.Game.Tests/Visual/Menus/TestSceneToolbarUserButton.cs
@@ -0,0 +1,87 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using NUnit.Framework;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Game.Online.API;
+using osu.Game.Overlays.Toolbar;
+using osuTK;
+using osuTK.Graphics;
+
+namespace osu.Game.Tests.Visual.Menus
+{
+ [TestFixture]
+ public class TestSceneToolbarUserButton : OsuManualInputManagerTestScene
+ {
+ public TestSceneToolbarUserButton()
+ {
+ Container mainContainer;
+
+ Children = new Drawable[]
+ {
+ mainContainer = new Container
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ RelativeSizeAxes = Axes.X,
+ Height = Toolbar.HEIGHT,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ Colour = Color4.Black,
+ RelativeSizeAxes = Axes.Both,
+ },
+ new FillFlowContainer
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ RelativeSizeAxes = Axes.Y,
+ AutoSizeAxes = Axes.X,
+ Direction = FillDirection.Horizontal,
+ Children = new Drawable[]
+ {
+ new Box
+ {
+ Colour = Color4.DarkRed,
+ RelativeSizeAxes = Axes.Y,
+ Width = 2,
+ },
+ new ToolbarUserButton(),
+ new Box
+ {
+ Colour = Color4.DarkRed,
+ RelativeSizeAxes = Axes.Y,
+ Width = 2,
+ },
+ }
+ },
+ }
+ },
+ };
+
+ AddSliderStep("scale", 0.5, 4, 1, scale => mainContainer.Scale = new Vector2((float)scale));
+ }
+
+ [Test]
+ public void TestLoginLogout()
+ {
+ AddStep("Log out", () => ((DummyAPIAccess)API).Logout());
+ AddStep("Log in", () => ((DummyAPIAccess)API).Login("wang", "jang"));
+ }
+
+ [Test]
+ public void TestStates()
+ {
+ AddStep("Log in", () => ((DummyAPIAccess)API).Login("wang", "jang"));
+
+ foreach (var state in Enum.GetValues())
+ {
+ AddStep($"Change state to {state}", () => ((DummyAPIAccess)API).SetState(state));
+ }
+ }
+ }
+}
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
index d626426e6d..a2e3ab7318 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiSpectatorScreen.cs
@@ -432,8 +432,8 @@ namespace osu.Game.Tests.Visual.Multiplayer
{
var user = playingUsers.Single(u => u.UserID == userId);
- OnlinePlayDependencies.MultiplayerClient.RemoveUser(user.User.AsNonNull());
SpectatorClient.SendEndPlay(userId);
+ OnlinePlayDependencies.MultiplayerClient.RemoveUser(user.User.AsNonNull());
playingUsers.Remove(user);
});
@@ -451,7 +451,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
}
private void checkPaused(int userId, bool state)
- => AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType().First().GameplayClock.IsRunning != state);
+ => AddUntilStep($"{userId} is {(state ? "paused" : "playing")}", () => getPlayer(userId).ChildrenOfType().First().IsRunning != state);
private void checkPausedInstant(int userId, bool state)
{
diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
index 269867be73..6098a3e794 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
@@ -671,7 +671,7 @@ namespace osu.Game.Tests.Visual.Multiplayer
for (double i = 1000; i < TestResources.QUICK_BEATMAP_LENGTH; i += 1000)
{
double time = i;
- AddUntilStep($"wait for time > {i}", () => this.ChildrenOfType().SingleOrDefault()?.GameplayClock.CurrentTime > time);
+ AddUntilStep($"wait for time > {i}", () => this.ChildrenOfType().SingleOrDefault()?.CurrentTime > time);
}
AddUntilStep("wait for results", () => multiplayerComponents.CurrentScreen is ResultsScreen);
diff --git a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
index 13f83eac96..901f234db6 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestSceneModPresetColumn.cs
@@ -134,6 +134,7 @@ namespace osu.Game.Tests.Visual.UserInterface
public void TestSoftDeleteSupport()
{
AddStep("set osu! ruleset", () => Ruleset.Value = rulesets.GetRuleset(0));
+ AddStep("clear mods", () => SelectedMods.Value = Array.Empty());
AddStep("create content", () => Child = new ModPresetColumn
{
Anchor = Anchor.Centre,
@@ -153,9 +154,11 @@ namespace osu.Game.Tests.Visual.UserInterface
foreach (var preset in r.All())
preset.DeletePending = true;
}));
- AddUntilStep("no panels visible", () => this.ChildrenOfType().Count() == 0);
+ AddUntilStep("no panels visible", () => !this.ChildrenOfType().Any());
- AddStep("undelete preset", () => Realm.Write(r =>
+ AddStep("select mods from first preset", () => SelectedMods.Value = new Mod[] { new OsuModDoubleTime(), new OsuModHardRock() });
+
+ AddStep("undelete presets", () => Realm.Write(r =>
{
foreach (var preset in r.All())
preset.DeletePending = false;
diff --git a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
index ee5ef2f364..e67eebf721 100644
--- a/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
+++ b/osu.Game.Tests/Visual/UserInterface/TestScenePlaylistOverlay.cs
@@ -1,18 +1,20 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
+using System.Collections.Generic;
using System.Linq;
using NUnit.Framework;
-using osu.Framework.Bindables;
+using osu.Framework.Allocation;
+using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
+using osu.Framework.Platform;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
+using osu.Game.Collections;
using osu.Game.Database;
-using osu.Game.Graphics.Containers;
using osu.Game.Overlays.Music;
+using osu.Game.Rulesets;
using osu.Game.Tests.Resources;
using osuTK;
using osuTK.Input;
@@ -21,13 +23,25 @@ namespace osu.Game.Tests.Visual.UserInterface
{
public class TestScenePlaylistOverlay : OsuManualInputManagerTestScene
{
- private readonly BindableList> beatmapSets = new BindableList>();
+ protected override bool UseFreshStoragePerRun => true;
- private PlaylistOverlay playlistOverlay;
+ private PlaylistOverlay playlistOverlay = null!;
- private Live first;
+ private BeatmapManager beatmapManager = null!;
- private const int item_count = 100;
+ private const int item_count = 20;
+
+ private List beatmapSets => beatmapManager.GetAllUsableBeatmapSets();
+
+ [BackgroundDependencyLoader]
+ private void load(GameHost host)
+ {
+ Dependencies.Cache(new RealmRulesetStore(Realm));
+ Dependencies.Cache(beatmapManager = new BeatmapManager(LocalStorage, Realm, null, Audio, Resources, host, Beatmap.Default));
+ Dependencies.Cache(Realm);
+
+ beatmapManager.Import(TestResources.GetQuickTestBeatmapForImport()).WaitSafely();
+ }
[SetUp]
public void Setup() => Schedule(() =>
@@ -46,16 +60,12 @@ namespace osu.Game.Tests.Visual.UserInterface
}
};
- beatmapSets.Clear();
-
for (int i = 0; i < item_count; i++)
{
- beatmapSets.Add(TestResources.CreateTestBeatmapSetInfo().ToLiveUnmanaged());
+ beatmapManager.Import(TestResources.CreateTestBeatmapSetInfo());
}
- first = beatmapSets.First();
-
- playlistOverlay.BeatmapSets.BindTo(beatmapSets);
+ beatmapSets.First().ToLive(Realm);
});
[Test]
@@ -70,9 +80,13 @@ namespace osu.Game.Tests.Visual.UserInterface
AddUntilStep("wait for animations to complete", () => !playlistOverlay.Transforms.Any());
+ PlaylistItem firstItem = null!;
+
AddStep("hold 1st item handle", () =>
{
- var handle = this.ChildrenOfType>.PlaylistItemHandle>().First();
+ firstItem = this.ChildrenOfType().First();
+ var handle = firstItem.ChildrenOfType().First();
+
InputManager.MoveMouseTo(handle.ScreenSpaceDrawQuad.Centre);
InputManager.PressButton(MouseButton.Left);
});
@@ -83,7 +97,7 @@ namespace osu.Game.Tests.Visual.UserInterface
InputManager.MoveMouseTo(item.ScreenSpaceDrawQuad.BottomLeft);
});
- AddAssert("song 1 is 5th", () => beatmapSets[4].Equals(first));
+ AddAssert("first is moved", () => playlistOverlay.ChildrenOfType().Single().Items.ElementAt(4).Value.Equals(firstItem.Model.Value));
AddStep("release handle", () => InputManager.ReleaseButton(MouseButton.Left));
}
@@ -101,6 +115,68 @@ namespace osu.Game.Tests.Visual.UserInterface
() => playlistOverlay.ChildrenOfType()
.Where(item => item.MatchingFilter)
.All(item => item.FilterTerms.Any(term => term.ToString().Contains("10"))));
+
+ AddStep("Import new non-matching beatmap", () =>
+ {
+ var testBeatmapSetInfo = TestResources.CreateTestBeatmapSetInfo(1);
+ testBeatmapSetInfo.Beatmaps.Single().Metadata.Title = "no guid";
+ beatmapManager.Import(testBeatmapSetInfo);
+ });
+
+ AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
+
+ AddAssert("results filtered correctly",
+ () => playlistOverlay.ChildrenOfType()
+ .Where(item => item.MatchingFilter)
+ .All(item => item.FilterTerms.Any(term => term.ToString().Contains("10"))));
+ }
+
+ [Test]
+ public void TestCollectionFiltering()
+ {
+ NowPlayingCollectionDropdown collectionDropdown() => playlistOverlay.ChildrenOfType().Single();
+
+ AddStep("Add collection", () =>
+ {
+ Dependencies.Get().Write(r =>
+ {
+ r.RemoveAll();
+ r.Add(new BeatmapCollection("wang"));
+ });
+ });
+
+ AddUntilStep("wait for dropdown to have new collection", () => collectionDropdown().Items.Count() == 2);
+
+ AddStep("Filter to collection", () =>
+ {
+ collectionDropdown().Current.Value = collectionDropdown().Items.Last();
+ });
+
+ AddUntilStep("No items present", () => !playlistOverlay.ChildrenOfType().Any(i => i.MatchingFilter));
+
+ AddStep("Import new non-matching beatmap", () =>
+ {
+ beatmapManager.Import(TestResources.CreateTestBeatmapSetInfo(1));
+ });
+
+ AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
+
+ AddUntilStep("No items matching", () => !playlistOverlay.ChildrenOfType().Any(i => i.MatchingFilter));
+
+ BeatmapSetInfo collectionAddedBeatmapSet = null!;
+
+ AddStep("Import new matching beatmap", () =>
+ {
+ collectionAddedBeatmapSet = TestResources.CreateTestBeatmapSetInfo(1);
+
+ beatmapManager.Import(collectionAddedBeatmapSet);
+ Realm.Write(r => r.All().First().BeatmapMD5Hashes.Add(collectionAddedBeatmapSet.Beatmaps.First().MD5Hash));
+ });
+
+ AddStep("Force realm refresh", () => Realm.Run(r => r.Refresh()));
+
+ AddUntilStep("Only matching item",
+ () => playlistOverlay.ChildrenOfType().Where(i => i.MatchingFilter).Select(i => i.Model.ID), () => Is.EquivalentTo(new[] { collectionAddedBeatmapSet.ID }));
}
}
}
diff --git a/osu.Game/Beatmaps/BeatmapInfo.cs b/osu.Game/Beatmaps/BeatmapInfo.cs
index c53c2f67dd..9196dde73c 100644
--- a/osu.Game/Beatmaps/BeatmapInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapInfo.cs
@@ -199,8 +199,8 @@ namespace osu.Game.Beatmaps
Debug.Assert(x.BeatmapSet != null);
Debug.Assert(y.BeatmapSet != null);
- string? fileHashX = x.BeatmapSet.Files.FirstOrDefault(f => f.Filename == getFilename(x.Metadata))?.File.Hash;
- string? fileHashY = y.BeatmapSet.Files.FirstOrDefault(f => f.Filename == getFilename(y.Metadata))?.File.Hash;
+ string? fileHashX = x.BeatmapSet.GetFile(getFilename(x.Metadata))?.File.Hash;
+ string? fileHashY = y.BeatmapSet.GetFile(getFilename(y.Metadata))?.File.Hash;
return fileHashX == fileHashY;
}
diff --git a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
index e7ff07fa5d..eab66b9857 100644
--- a/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
+++ b/osu.Game/Beatmaps/BeatmapInfoExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Linq;
using osu.Framework.Localisation;
diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index b6bfab32cd..e148016487 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -300,7 +300,7 @@ namespace osu.Game.Beatmaps
stream.Seek(0, SeekOrigin.Begin);
// AddFile generally handles updating/replacing files, but this is a case where the filename may have also changed so let's delete for simplicity.
- var existingFileInfo = setInfo.Files.SingleOrDefault(f => string.Equals(f.Filename, beatmapInfo.Path, StringComparison.OrdinalIgnoreCase));
+ var existingFileInfo = beatmapInfo.Path != null ? setInfo.GetFile(beatmapInfo.Path) : null;
string targetFilename = createBeatmapFilenameFromMetadata(beatmapInfo);
// ensure that two difficulties from the set don't point at the same beatmap file.
diff --git a/osu.Game/Beatmaps/BeatmapSetInfo.cs b/osu.Game/Beatmaps/BeatmapSetInfo.cs
index d27d9d9192..b90dfdba05 100644
--- a/osu.Game/Beatmaps/BeatmapSetInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetInfo.cs
@@ -84,13 +84,6 @@ namespace osu.Game.Beatmaps
{
}
- ///
- /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
- /// The path returned is relative to the user file storage.
- ///
- /// The name of the file to get the storage path of.
- public string? GetPathForFile(string filename) => Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath();
-
public bool Equals(BeatmapSetInfo? other)
{
if (ReferenceEquals(this, other)) return true;
diff --git a/osu.Game/Beatmaps/BeatmapSetInfoExtensions.cs b/osu.Game/Beatmaps/BeatmapSetInfoExtensions.cs
new file mode 100644
index 0000000000..965544da40
--- /dev/null
+++ b/osu.Game/Beatmaps/BeatmapSetInfoExtensions.cs
@@ -0,0 +1,33 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System;
+using System.Linq;
+using osu.Game.Database;
+using osu.Game.Extensions;
+using osu.Game.Models;
+
+namespace osu.Game.Beatmaps
+{
+ public static class BeatmapSetInfoExtensions
+ {
+ ///
+ /// Returns the storage path for the file in this beatmapset with the given filename, if any exists, otherwise null.
+ /// The path returned is relative to the user file storage.
+ /// The lookup is case insensitive.
+ ///
+ /// The model to operate on.
+ /// The name of the file to get the storage path of.
+ public static string? GetPathForFile(this IHasRealmFiles model, string filename) => model.GetFile(filename)?.File.GetStoragePath();
+
+ ///
+ /// Returns the file usage for the file in this beatmapset with the given filename, if any exists, otherwise null.
+ /// The path returned is relative to the user file storage.
+ /// The lookup is case insensitive.
+ ///
+ /// The model to operate on.
+ /// The name of the file to get the storage path of.
+ public static RealmNamedFileUsage? GetFile(this IHasRealmFiles model, string filename) =>
+ model.Files.SingleOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase));
+ }
+}
diff --git a/osu.Game/Configuration/BackgroundSource.cs b/osu.Game/Configuration/BackgroundSource.cs
index b4a1fd78c3..f08b29cffe 100644
--- a/osu.Game/Configuration/BackgroundSource.cs
+++ b/osu.Game/Configuration/BackgroundSource.cs
@@ -3,16 +3,20 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum BackgroundSource
{
+ [LocalisableDescription(typeof(SkinSettingsStrings), nameof(SkinSettingsStrings.SkinSectionHeader))]
Skin,
+
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.BeatmapHeader))]
Beatmap,
- [Description("Beatmap (with storyboard / video)")]
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.BeatmapWithStoryboard))]
BeatmapWithStoryboard,
}
}
diff --git a/osu.Game/Configuration/DiscordRichPresenceMode.cs b/osu.Game/Configuration/DiscordRichPresenceMode.cs
index 935619920a..150d23447e 100644
--- a/osu.Game/Configuration/DiscordRichPresenceMode.cs
+++ b/osu.Game/Configuration/DiscordRichPresenceMode.cs
@@ -3,17 +3,20 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum DiscordRichPresenceMode
{
+ [LocalisableDescription(typeof(OnlineSettingsStrings), nameof(OnlineSettingsStrings.DiscordPresenceOff))]
Off,
- [Description("Hide identifiable information")]
+ [LocalisableDescription(typeof(OnlineSettingsStrings), nameof(OnlineSettingsStrings.HideIdentifiableInformation))]
Limited,
+ [LocalisableDescription(typeof(OnlineSettingsStrings), nameof(OnlineSettingsStrings.DiscordPresenceFull))]
Full
}
}
diff --git a/osu.Game/Configuration/HUDVisibilityMode.cs b/osu.Game/Configuration/HUDVisibilityMode.cs
index ec54bfcb71..9c69f33220 100644
--- a/osu.Game/Configuration/HUDVisibilityMode.cs
+++ b/osu.Game/Configuration/HUDVisibilityMode.cs
@@ -3,17 +3,20 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum HUDVisibilityMode
{
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.NeverShowHUD))]
Never,
- [Description("Hide during gameplay")]
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.HideDuringGameplay))]
HideDuringGameplay,
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.AlwaysShowHUD))]
Always
}
}
diff --git a/osu.Game/Configuration/RandomSelectAlgorithm.cs b/osu.Game/Configuration/RandomSelectAlgorithm.cs
index 9a02aaee60..052c6b4c55 100644
--- a/osu.Game/Configuration/RandomSelectAlgorithm.cs
+++ b/osu.Game/Configuration/RandomSelectAlgorithm.cs
@@ -3,16 +3,17 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum RandomSelectAlgorithm
{
- [Description("Never repeat")]
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.NeverRepeat))]
RandomPermutation,
- [Description("True Random")]
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.TrueRandom))]
Random
}
}
diff --git a/osu.Game/Configuration/ScalingMode.cs b/osu.Game/Configuration/ScalingMode.cs
index 25c3692a1a..e0ad59746b 100644
--- a/osu.Game/Configuration/ScalingMode.cs
+++ b/osu.Game/Configuration/ScalingMode.cs
@@ -3,17 +3,23 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum ScalingMode
{
+ [LocalisableDescription(typeof(LayoutSettingsStrings), nameof(LayoutSettingsStrings.ScalingOff))]
Off,
+
+ [LocalisableDescription(typeof(LayoutSettingsStrings), nameof(LayoutSettingsStrings.ScaleEverything))]
Everything,
- [Description("Excluding overlays")]
+ [LocalisableDescription(typeof(LayoutSettingsStrings), nameof(LayoutSettingsStrings.ScaleEverythingExcludingOverlays))]
ExcludeOverlays,
+
+ [LocalisableDescription(typeof(LayoutSettingsStrings), nameof(LayoutSettingsStrings.ScaleGameplay))]
Gameplay,
}
}
diff --git a/osu.Game/Configuration/ScreenshotFormat.cs b/osu.Game/Configuration/ScreenshotFormat.cs
index 57c08538b8..13d0b64fd2 100644
--- a/osu.Game/Configuration/ScreenshotFormat.cs
+++ b/osu.Game/Configuration/ScreenshotFormat.cs
@@ -3,16 +3,17 @@
#nullable disable
-using System.ComponentModel;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Configuration
{
public enum ScreenshotFormat
{
- [Description("JPG (web-friendly)")]
+ [LocalisableDescription(typeof(GraphicsSettingsStrings), nameof(GraphicsSettingsStrings.Jpg))]
Jpg = 1,
- [Description("PNG (lossless)")]
+ [LocalisableDescription(typeof(GraphicsSettingsStrings), nameof(GraphicsSettingsStrings.Png))]
Png = 2
}
}
diff --git a/osu.Game/Configuration/SeasonalBackgroundMode.cs b/osu.Game/Configuration/SeasonalBackgroundMode.cs
index 909798fe97..3e6d9e42aa 100644
--- a/osu.Game/Configuration/SeasonalBackgroundMode.cs
+++ b/osu.Game/Configuration/SeasonalBackgroundMode.cs
@@ -3,6 +3,9 @@
#nullable disable
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
+
namespace osu.Game.Configuration
{
public enum SeasonalBackgroundMode
@@ -10,16 +13,19 @@ namespace osu.Game.Configuration
///
/// Seasonal backgrounds are shown regardless of season, if at all available.
///
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.AlwaysSeasonalBackground))]
Always,
///
/// Seasonal backgrounds are shown only during their corresponding season.
///
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.SometimesSeasonalBackground))]
Sometimes,
///
/// Seasonal backgrounds are never shown.
///
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.NeverSeasonalBackground))]
Never
}
}
diff --git a/osu.Game/Database/IHasRealmFiles.cs b/osu.Game/Database/IHasRealmFiles.cs
index 2adfe73d1e..79ea719583 100644
--- a/osu.Game/Database/IHasRealmFiles.cs
+++ b/osu.Game/Database/IHasRealmFiles.cs
@@ -2,6 +2,7 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
+using osu.Game.Beatmaps;
using osu.Game.Models;
namespace osu.Game.Database
@@ -11,8 +12,16 @@ namespace osu.Game.Database
///
public interface IHasRealmFiles
{
+ ///
+ /// Available files in this model, with locally filenames.
+ /// When performing lookups, consider using or to do case-insensitive lookups.
+ ///
IList Files { get; }
+ ///
+ /// A combined hash representing the model, based on the files it contains.
+ /// Implementation specific.
+ ///
string Hash { get; set; }
}
}
diff --git a/osu.Game/Database/LegacyImportManager.cs b/osu.Game/Database/LegacyImportManager.cs
index 96f4aaf67c..78ebd8750e 100644
--- a/osu.Game/Database/LegacyImportManager.cs
+++ b/osu.Game/Database/LegacyImportManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Generic;
using System.Threading;
@@ -27,27 +25,30 @@ namespace osu.Game.Database
public class LegacyImportManager : Component
{
[Resolved]
- private SkinManager skins { get; set; }
+ private SkinManager skins { get; set; } = null!;
[Resolved]
- private BeatmapManager beatmaps { get; set; }
+ private BeatmapManager beatmaps { get; set; } = null!;
[Resolved]
- private ScoreManager scores { get; set; }
-
- [Resolved(canBeNull: true)]
- private OsuGame game { get; set; }
+ private ScoreManager scores { get; set; } = null!;
[Resolved]
- private IDialogOverlay dialogOverlay { get; set; }
+ private OsuGame? game { get; set; }
[Resolved]
- private RealmAccess realmAccess { get; set; }
+ private IDialogOverlay dialogOverlay { get; set; } = null!;
- [Resolved(canBeNull: true)]
- private DesktopGameHost desktopGameHost { get; set; }
+ [Resolved]
+ private RealmAccess realmAccess { get; set; } = null!;
- private StableStorage cachedStorage;
+ [Resolved(canBeNull: true)] // canBeNull required while we remain on mono for mobile platforms.
+ private DesktopGameHost? desktopGameHost { get; set; }
+
+ [Resolved]
+ private INotificationOverlay? notifications { get; set; }
+
+ private StableStorage? cachedStorage;
public bool SupportsImportFromStable => RuntimeInfo.IsDesktop;
@@ -98,6 +99,9 @@ namespace osu.Game.Database
stableStorage = GetCurrentStableStorage();
}
+ if (stableStorage == null)
+ return;
+
var importTasks = new List();
Task beatmapImportTask = Task.CompletedTask;
@@ -108,7 +112,14 @@ namespace osu.Game.Database
importTasks.Add(new LegacySkinImporter(skins).ImportFromStableAsync(stableStorage));
if (content.HasFlagFast(StableContent.Collections))
- importTasks.Add(beatmapImportTask.ContinueWith(_ => new LegacyCollectionImporter(realmAccess).ImportFromStorage(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+ {
+ importTasks.Add(beatmapImportTask.ContinueWith(_ => new LegacyCollectionImporter(realmAccess)
+ {
+ // Other legacy importers import via model managers which handle the posting of notifications.
+ // Collections are an exception.
+ PostNotification = n => notifications?.Post(n)
+ }.ImportFromStorage(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
+ }
if (content.HasFlagFast(StableContent.Scores))
importTasks.Add(beatmapImportTask.ContinueWith(_ => new LegacyScoreImporter(scores).ImportFromStableAsync(stableStorage), TaskContinuationOptions.OnlyOnRanToCompletion));
@@ -116,7 +127,7 @@ namespace osu.Game.Database
await Task.WhenAll(importTasks.ToArray()).ConfigureAwait(false);
}
- public StableStorage GetCurrentStableStorage()
+ public StableStorage? GetCurrentStableStorage()
{
if (cachedStorage != null)
return cachedStorage;
diff --git a/osu.Game/Database/ModelManager.cs b/osu.Game/Database/ModelManager.cs
index 4224c92f2c..5c106aa493 100644
--- a/osu.Game/Database/ModelManager.cs
+++ b/osu.Game/Database/ModelManager.cs
@@ -7,6 +7,7 @@ using System.Diagnostics;
using System.IO;
using System.Linq;
using osu.Framework.Platform;
+using osu.Game.Beatmaps;
using osu.Game.Extensions;
using osu.Game.Models;
using osu.Game.Overlays.Notifications;
@@ -79,7 +80,7 @@ namespace osu.Game.Database
///
public void AddFile(TModel item, Stream contents, string filename, Realm realm)
{
- var existing = item.Files.FirstOrDefault(f => string.Equals(f.Filename, filename, StringComparison.OrdinalIgnoreCase));
+ var existing = item.GetFile(filename);
if (existing != null)
{
diff --git a/osu.Game/Database/RealmAccess.cs b/osu.Game/Database/RealmAccess.cs
index 1fb1c1da5c..8099db44b1 100644
--- a/osu.Game/Database/RealmAccess.cs
+++ b/osu.Game/Database/RealmAccess.cs
@@ -173,6 +173,11 @@ namespace osu.Game.Database
if (!Filename.EndsWith(realm_extension, StringComparison.Ordinal))
Filename += realm_extension;
+#if DEBUG
+ if (!DebugUtils.IsNUnitRunning)
+ applyFilenameSchemaSuffix(ref Filename);
+#endif
+
string newerVersionFilename = $"{Filename.Replace(realm_extension, string.Empty)}_newer_version{realm_extension}";
// Attempt to recover a newer database version if available.
@@ -212,6 +217,51 @@ namespace osu.Game.Database
}
}
+ ///
+ /// Some developers may be annoyed if a newer version migration (ie. caused by testing a pull request)
+ /// cause their test database to be unusable with previous versions.
+ /// To get around this, store development databases against their realm version.
+ /// Note that this means changes made on newer realm versions will disappear.
+ ///
+ private void applyFilenameSchemaSuffix(ref string filename)
+ {
+ string originalFilename = filename;
+
+ filename = getVersionedFilename(schema_version);
+
+ // First check if the current realm version already exists...
+ if (storage.Exists(filename))
+ return;
+
+ // Check for a previous version we can use as a base database to migrate from...
+ for (int i = schema_version - 1; i >= 0; i--)
+ {
+ string previousFilename = getVersionedFilename(i);
+
+ if (storage.Exists(previousFilename))
+ {
+ copyPreviousVersion(previousFilename, filename);
+ return;
+ }
+ }
+
+ // Finally, check for a non-versioned file exists (aka before this method was added)...
+ if (storage.Exists(originalFilename))
+ copyPreviousVersion(originalFilename, filename);
+
+ void copyPreviousVersion(string previousFilename, string newFilename)
+ {
+ using (var previous = storage.GetStream(previousFilename))
+ using (var current = storage.CreateFileSafely(newFilename))
+ {
+ Logger.Log(@$"Copying previous realm database {previousFilename} to {newFilename} for migration to schema version {schema_version}");
+ previous.CopyTo(current);
+ }
+ }
+
+ string getVersionedFilename(int version) => originalFilename.Replace(realm_extension, $"_{version}{realm_extension}");
+ }
+
private void attemptRecoverFromFile(string recoveryFilename)
{
Logger.Log($@"Performing recovery from {recoveryFilename}", LoggingTarget.Database);
diff --git a/osu.Game/Graphics/UserInterface/FPSCounter.cs b/osu.Game/Graphics/UserInterface/FPSCounter.cs
index fc5fac5cef..e9fb6a046a 100644
--- a/osu.Game/Graphics/UserInterface/FPSCounter.cs
+++ b/osu.Game/Graphics/UserInterface/FPSCounter.cs
@@ -167,6 +167,11 @@ namespace osu.Game.Graphics.UserInterface
{
base.Update();
+ // If the game goes into a suspended state (ie. debugger attached or backgrounded on a mobile device)
+ // we want to ignore really long periods of no processing.
+ if (updateClock.ElapsedFrameTime > 10000)
+ return;
+
mainContent.Width = Math.Max(mainContent.Width, counters.DrawWidth);
// Handle the case where the window has become inactive or the user changed the
@@ -177,15 +182,15 @@ namespace osu.Game.Graphics.UserInterface
// use elapsed frame time rather then FramesPerSecond to better catch stutter frames.
bool hasDrawSpike = displayedFpsCount > (1000 / spike_time_ms) && drawClock.ElapsedFrameTime > spike_time_ms;
- // note that we use an elapsed time here of 1 intentionally.
- // this weights all updates equally. if we passed in the elapsed time, longer frames would be weighted incorrectly lower.
- displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, updateClock.ElapsedFrameTime, hasUpdateSpike ? 0 : 100, 1);
+ const float damp_time = 100;
+
+ displayedFrameTime = Interpolation.DampContinuously(displayedFrameTime, updateClock.ElapsedFrameTime, hasUpdateSpike ? 0 : damp_time, updateClock.ElapsedFrameTime);
if (hasDrawSpike)
// show spike time using raw elapsed value, to account for `FramesPerSecond` being so averaged spike frames don't show.
displayedFpsCount = 1000 / drawClock.ElapsedFrameTime;
else
- displayedFpsCount = Interpolation.DampContinuously(displayedFpsCount, drawClock.FramesPerSecond, 100, Time.Elapsed);
+ displayedFpsCount = Interpolation.DampContinuously(displayedFpsCount, drawClock.FramesPerSecond, damp_time, Time.Elapsed);
if (Time.Current - lastUpdate > min_time_between_updates)
{
diff --git a/osu.Game/Graphics/UserInterface/LoadingLayer.cs b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
index b3655eaab4..9f6177c226 100644
--- a/osu.Game/Graphics/UserInterface/LoadingLayer.cs
+++ b/osu.Game/Graphics/UserInterface/LoadingLayer.cs
@@ -20,6 +20,8 @@ namespace osu.Game.Graphics.UserInterface
///
public class LoadingLayer : LoadingSpinner
{
+ private readonly bool blockInput;
+
[CanBeNull]
protected Box BackgroundDimLayer { get; }
@@ -28,9 +30,11 @@ namespace osu.Game.Graphics.UserInterface
///
/// Whether the full background area should be dimmed while loading.
/// Whether the spinner should have a surrounding black box for visibility.
- public LoadingLayer(bool dimBackground = false, bool withBox = true)
+ /// Whether to block input of components behind the loading layer.
+ public LoadingLayer(bool dimBackground = false, bool withBox = true, bool blockInput = true)
: base(withBox)
{
+ this.blockInput = blockInput;
RelativeSizeAxes = Axes.Both;
Size = new Vector2(1);
@@ -52,6 +56,9 @@ namespace osu.Game.Graphics.UserInterface
protected override bool Handle(UIEvent e)
{
+ if (!blockInput)
+ return false;
+
switch (e)
{
// blocking scroll can cause weird behaviour when this layer is used within a ScrollContainer.
@@ -83,7 +90,7 @@ namespace osu.Game.Graphics.UserInterface
{
base.Update();
- MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 30, 100));
+ MainContents.Size = new Vector2(Math.Clamp(Math.Min(DrawWidth, DrawHeight) * 0.25f, 20, 100));
}
}
}
diff --git a/osu.Game/Input/Bindings/GlobalActionContainer.cs b/osu.Game/Input/Bindings/GlobalActionContainer.cs
index 1ee03a6964..ad53f6d90f 100644
--- a/osu.Game/Input/Bindings/GlobalActionContainer.cs
+++ b/osu.Game/Input/Bindings/GlobalActionContainer.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics;
@@ -15,10 +13,11 @@ namespace osu.Game.Input.Bindings
{
public class GlobalActionContainer : DatabasedKeyBindingContainer, IHandleGlobalKeyboardInput
{
- private readonly Drawable handler;
- private InputManager parentInputManager;
+ private readonly Drawable? handler;
- public GlobalActionContainer(OsuGameBase game)
+ private InputManager? parentInputManager;
+
+ public GlobalActionContainer(OsuGameBase? game)
: base(matchingMode: KeyCombinationMatchingMode.Modifiers)
{
if (game is IKeyBindingHandler)
@@ -32,7 +31,10 @@ namespace osu.Game.Input.Bindings
parentInputManager = GetContainingInputManager();
}
+ // IMPORTANT: Do not change the order of key bindings in this list.
+ // It is used to decide the order of precedence (see note in DatabasedKeyBindingContainer).
public override IEnumerable DefaultKeyBindings => GlobalKeyBindings
+ .Concat(OverlayKeyBindings)
.Concat(EditorKeyBindings)
.Concat(InGameKeyBindings)
.Concat(SongSelectKeyBindings)
@@ -40,25 +42,6 @@ namespace osu.Game.Input.Bindings
public IEnumerable GlobalKeyBindings => new[]
{
- new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
- new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
- new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
- new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
- new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
- new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.F }, GlobalAction.ToggleFPSDisplay),
-
- new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
- new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
- new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
- new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
- new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
- new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.S }, GlobalAction.ToggleSkinEditor),
-
- new KeyBinding(InputKey.Escape, GlobalAction.Back),
- new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
-
- new KeyBinding(new[] { InputKey.Alt, InputKey.Home }, GlobalAction.Home),
-
new KeyBinding(InputKey.Up, GlobalAction.SelectPrevious),
new KeyBinding(InputKey.Down, GlobalAction.SelectNext),
@@ -69,7 +52,32 @@ namespace osu.Game.Input.Bindings
new KeyBinding(InputKey.Enter, GlobalAction.Select),
new KeyBinding(InputKey.KeypadEnter, GlobalAction.Select),
+ new KeyBinding(InputKey.Escape, GlobalAction.Back),
+ new KeyBinding(InputKey.ExtraMouseButton1, GlobalAction.Back),
+
+ new KeyBinding(new[] { InputKey.Alt, InputKey.Home }, GlobalAction.Home),
+
+ new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.F }, GlobalAction.ToggleFPSDisplay),
+ new KeyBinding(new[] { InputKey.Control, InputKey.T }, GlobalAction.ToggleToolbar),
+ new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.S }, GlobalAction.ToggleSkinEditor),
+ new KeyBinding(new[] { InputKey.Control, InputKey.P }, GlobalAction.ToggleProfile),
+
+ new KeyBinding(new[] { InputKey.Control, InputKey.Alt, InputKey.R }, GlobalAction.ResetInputSettings),
+
new KeyBinding(new[] { InputKey.Control, InputKey.Shift, InputKey.R }, GlobalAction.RandomSkin),
+
+ new KeyBinding(InputKey.F10, GlobalAction.ToggleGameplayMouseButtons),
+ new KeyBinding(InputKey.F12, GlobalAction.TakeScreenshot),
+ };
+
+ public IEnumerable OverlayKeyBindings => new[]
+ {
+ new KeyBinding(InputKey.F8, GlobalAction.ToggleChat),
+ new KeyBinding(InputKey.F6, GlobalAction.ToggleNowPlaying),
+ new KeyBinding(InputKey.F9, GlobalAction.ToggleSocial),
+ new KeyBinding(new[] { InputKey.Control, InputKey.D }, GlobalAction.ToggleBeatmapListing),
+ new KeyBinding(new[] { InputKey.Control, InputKey.O }, GlobalAction.ToggleSettings),
+ new KeyBinding(new[] { InputKey.Control, InputKey.N }, GlobalAction.ToggleNotifications),
};
public IEnumerable EditorKeyBindings => new[]
@@ -332,5 +340,8 @@ namespace osu.Game.Input.Bindings
[LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleFPSCounter))]
ToggleFPSDisplay,
+
+ [LocalisableDescription(typeof(GlobalActionKeyBindingStrings), nameof(GlobalActionKeyBindingStrings.ToggleProfile))]
+ ToggleProfile,
}
}
diff --git a/osu.Game/Input/OsuConfineMouseMode.cs b/osu.Game/Input/OsuConfineMouseMode.cs
index 2a93ac1cd6..2d914ac6e0 100644
--- a/osu.Game/Input/OsuConfineMouseMode.cs
+++ b/osu.Game/Input/OsuConfineMouseMode.cs
@@ -3,8 +3,9 @@
#nullable disable
-using System.ComponentModel;
using osu.Framework.Input;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Input
{
@@ -17,18 +18,20 @@ namespace osu.Game.Input
///
/// The mouse cursor will be free to move outside the game window.
///
+ [LocalisableDescription(typeof(MouseSettingsStrings), nameof(MouseSettingsStrings.NeverConfine))]
Never,
///
/// The mouse cursor will be locked to the window bounds during gameplay,
/// but may otherwise move freely.
///
- [Description("During Gameplay")]
+ [LocalisableDescription(typeof(MouseSettingsStrings), nameof(MouseSettingsStrings.ConfineDuringGameplay))]
DuringGameplay,
///
/// The mouse cursor will always be locked to the window bounds while the game has focus.
///
+ [LocalisableDescription(typeof(MouseSettingsStrings), nameof(MouseSettingsStrings.AlwaysConfine))]
Always
}
}
diff --git a/osu.Game/Localisation/CommonStrings.cs b/osu.Game/Localisation/CommonStrings.cs
index f2dcd57742..93e3276f59 100644
--- a/osu.Game/Localisation/CommonStrings.cs
+++ b/osu.Game/Localisation/CommonStrings.cs
@@ -101,4 +101,4 @@ namespace osu.Game.Localisation
private static string getKey(string key) => $@"{prefix}:{key}";
}
-}
\ No newline at end of file
+}
diff --git a/osu.Game/Localisation/GameplaySettingsStrings.cs b/osu.Game/Localisation/GameplaySettingsStrings.cs
index 8a0f773551..13cfcc3a19 100644
--- a/osu.Game/Localisation/GameplaySettingsStrings.cs
+++ b/osu.Game/Localisation/GameplaySettingsStrings.cs
@@ -104,6 +104,31 @@ namespace osu.Game.Localisation
///
public static LocalisableString IncreaseFirstObjectVisibility => new TranslatableString(getKey(@"increase_first_object_visibility"), @"Increase visibility of first object when visual impairment mods are enabled");
+ ///
+ /// "Hide during gameplay"
+ ///
+ public static LocalisableString HideDuringGameplay => new TranslatableString(getKey(@"hide_during_gameplay"), @"Hide during gameplay");
+
+ ///
+ /// "Always"
+ ///
+ public static LocalisableString AlwaysShowHUD => new TranslatableString(getKey(@"always_show_hud"), @"Always");
+
+ ///
+ /// "Never"
+ ///
+ public static LocalisableString NeverShowHUD => new TranslatableString(getKey(@"never_show_hud"), @"Never");
+
+ ///
+ /// "Standardised"
+ ///
+ public static LocalisableString StandardisedScoreDisplay => new TranslatableString(getKey(@"standardised_score_display"), @"Standardised");
+
+ ///
+ /// "Classic"
+ ///
+ public static LocalisableString ClassicScoreDisplay => new TranslatableString(getKey(@"classic_score_display"), @"Classic");
+
private static string getKey(string key) => $"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
index de1a5b189c..172818c1c0 100644
--- a/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
+++ b/osu.Game/Localisation/GlobalActionKeyBindingStrings.cs
@@ -149,6 +149,11 @@ namespace osu.Game.Localisation
///
public static LocalisableString ToggleNotifications => new TranslatableString(getKey(@"toggle_notifications"), @"Toggle notifications");
+ ///
+ /// "Toggle profile"
+ ///
+ public static LocalisableString ToggleProfile => new TranslatableString(getKey(@"toggle_profile"), @"Toggle profile");
+
///
/// "Pause gameplay"
///
diff --git a/osu.Game/Localisation/GraphicsSettingsStrings.cs b/osu.Game/Localisation/GraphicsSettingsStrings.cs
index 38355d9041..2ab9d9de87 100644
--- a/osu.Game/Localisation/GraphicsSettingsStrings.cs
+++ b/osu.Game/Localisation/GraphicsSettingsStrings.cs
@@ -129,6 +129,16 @@ namespace osu.Game.Localisation
///
public static LocalisableString UseHardwareAcceleration => new TranslatableString(getKey(@"use_hardware_acceleration"), @"Use hardware acceleration");
+ ///
+ /// "JPG (web-friendly)"
+ ///
+ public static LocalisableString Jpg => new TranslatableString(getKey(@"jpg_web_friendly"), @"JPG (web-friendly)");
+
+ ///
+ /// "PNG (lossless)"
+ ///
+ public static LocalisableString Png => new TranslatableString(getKey(@"png_lossless"), @"PNG (lossless)");
+
private static string getKey(string key) => $"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/InputSettingsStrings.cs b/osu.Game/Localisation/InputSettingsStrings.cs
index e46b4cecf3..a0da6cc2f7 100644
--- a/osu.Game/Localisation/InputSettingsStrings.cs
+++ b/osu.Game/Localisation/InputSettingsStrings.cs
@@ -19,6 +19,11 @@ namespace osu.Game.Localisation
///
public static LocalisableString GlobalKeyBindingHeader => new TranslatableString(getKey(@"global_key_binding_header"), @"Global");
+ ///
+ /// "Overlays"
+ ///
+ public static LocalisableString OverlaysSection => new TranslatableString(getKey(@"overlays_section"), @"Overlays");
+
///
/// "Song Select"
///
diff --git a/osu.Game/Localisation/LayoutSettingsStrings.cs b/osu.Game/Localisation/LayoutSettingsStrings.cs
index b4326b8e39..9b8b207c47 100644
--- a/osu.Game/Localisation/LayoutSettingsStrings.cs
+++ b/osu.Game/Localisation/LayoutSettingsStrings.cs
@@ -29,6 +29,26 @@ namespace osu.Game.Localisation
///
public static LocalisableString FullscreenMacOSNote => new TranslatableString(getKey(@"fullscreen_macos_note"), @"Using fullscreen on macOS makes interacting with the menu bar and spaces no longer work, and may lead to freezes if a system dialog is presented. Using borderless is recommended.");
+ ///
+ /// "Excluding overlays"
+ ///
+ public static LocalisableString ScaleEverythingExcludingOverlays => new TranslatableString(getKey(@"scale_everything_excluding_overlays"), @"Excluding overlays");
+
+ ///
+ /// "Everything"
+ ///
+ public static LocalisableString ScaleEverything => new TranslatableString(getKey(@"scale_everything"), @"Everything");
+
+ ///
+ /// "Gameplay"
+ ///
+ public static LocalisableString ScaleGameplay => new TranslatableString(getKey(@"scale_gameplay"), @"Gameplay");
+
+ ///
+ /// "Off"
+ ///
+ public static LocalisableString ScalingOff => new TranslatableString(getKey(@"scaling_off"), @"Off");
+
private static string getKey(string key) => $@"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/MouseSettingsStrings.cs b/osu.Game/Localisation/MouseSettingsStrings.cs
index fd7225ad2e..1772f03b29 100644
--- a/osu.Game/Localisation/MouseSettingsStrings.cs
+++ b/osu.Game/Localisation/MouseSettingsStrings.cs
@@ -64,6 +64,21 @@ namespace osu.Game.Localisation
///
public static LocalisableString HighPrecisionPlatformWarning => new TranslatableString(getKey(@"high_precision_platform_warning"), @"This setting has known issues on your platform. If you encounter problems, it is recommended to adjust sensitivity externally and keep this disabled for now.");
+ ///
+ /// "Always"
+ ///
+ public static LocalisableString AlwaysConfine => new TranslatableString(getKey(@"always_confine"), @"Always");
+
+ ///
+ /// "During Gameplay"
+ ///
+ public static LocalisableString ConfineDuringGameplay => new TranslatableString(getKey(@"confine_during_gameplay"), @"During Gameplay");
+
+ ///
+ /// "Never"
+ ///
+ public static LocalisableString NeverConfine => new TranslatableString(getKey(@"never_confine"), @"Never");
+
private static string getKey(string key) => $@"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/OnlineSettingsStrings.cs b/osu.Game/Localisation/OnlineSettingsStrings.cs
index 6862f4ac2c..3200b1c75c 100644
--- a/osu.Game/Localisation/OnlineSettingsStrings.cs
+++ b/osu.Game/Localisation/OnlineSettingsStrings.cs
@@ -64,6 +64,21 @@ namespace osu.Game.Localisation
///
public static LocalisableString ShowExplicitContent => new TranslatableString(getKey(@"show_explicit_content"), @"Show explicit content in search results");
+ ///
+ /// "Hide identifiable information"
+ ///
+ public static LocalisableString HideIdentifiableInformation => new TranslatableString(getKey(@"hide_identifiable_information"), @"Hide identifiable information");
+
+ ///
+ /// "Full"
+ ///
+ public static LocalisableString DiscordPresenceFull => new TranslatableString(getKey(@"discord_presence_full"), @"Full");
+
+ ///
+ /// "Off"
+ ///
+ public static LocalisableString DiscordPresenceOff => new TranslatableString(getKey(@"discord_presence_off"), @"Off");
+
private static string getKey(string key) => $"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/RulesetSettingsStrings.cs b/osu.Game/Localisation/RulesetSettingsStrings.cs
index a356c9e20b..bc4be56c80 100644
--- a/osu.Game/Localisation/RulesetSettingsStrings.cs
+++ b/osu.Game/Localisation/RulesetSettingsStrings.cs
@@ -14,6 +14,21 @@ namespace osu.Game.Localisation
///
public static LocalisableString Rulesets => new TranslatableString(getKey(@"rulesets"), @"Rulesets");
+ ///
+ /// "None"
+ ///
+ public static LocalisableString BorderNone => new TranslatableString(getKey(@"no_borders"), @"None");
+
+ ///
+ /// "Corners"
+ ///
+ public static LocalisableString BorderCorners => new TranslatableString(getKey(@"corner_borders"), @"Corners");
+
+ ///
+ /// "Full"
+ ///
+ public static LocalisableString BorderFull => new TranslatableString(getKey(@"full_borders"), @"Full");
+
private static string getKey(string key) => $@"{prefix}:{key}";
}
}
diff --git a/osu.Game/Localisation/ToolbarStrings.cs b/osu.Game/Localisation/ToolbarStrings.cs
new file mode 100644
index 0000000000..6dc8a1e50c
--- /dev/null
+++ b/osu.Game/Localisation/ToolbarStrings.cs
@@ -0,0 +1,24 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using osu.Framework.Localisation;
+
+namespace osu.Game.Localisation
+{
+ public static class ToolbarStrings
+ {
+ private const string prefix = @"osu.Game.Resources.Localisation.Toolbar";
+
+ ///
+ /// "Connection interrupted, will try to reconnect..."
+ ///
+ public static LocalisableString AttemptingToReconnect => new TranslatableString(getKey(@"attempting_to_reconnect"), @"Connection interrupted, will try to reconnect...");
+
+ ///
+ /// "Connecting..."
+ ///
+ public static LocalisableString Connecting => new TranslatableString(getKey(@"connecting"), @"Connecting...");
+
+ private static string getKey(string key) => $@"{prefix}:{key}";
+ }
+}
diff --git a/osu.Game/Localisation/UserInterfaceStrings.cs b/osu.Game/Localisation/UserInterfaceStrings.cs
index a090b8c14c..ea664d7b50 100644
--- a/osu.Game/Localisation/UserInterfaceStrings.cs
+++ b/osu.Game/Localisation/UserInterfaceStrings.cs
@@ -114,6 +114,46 @@ namespace osu.Game.Localisation
///
public static LocalisableString NoLimit => new TranslatableString(getKey(@"no_limit"), @"no limit");
+ ///
+ /// "Beatmap (with storyboard / video)"
+ ///
+ public static LocalisableString BeatmapWithStoryboard => new TranslatableString(getKey(@"beatmap_with_storyboard"), @"Beatmap (with storyboard / video)");
+
+ ///
+ /// "Always"
+ ///
+ public static LocalisableString AlwaysSeasonalBackground => new TranslatableString(getKey(@"always_seasonal_backgrounds"), @"Always");
+
+ ///
+ /// "Never"
+ ///
+ public static LocalisableString NeverSeasonalBackground => new TranslatableString(getKey(@"never_seasonal_backgrounds"), @"Never");
+
+ ///
+ /// "Sometimes"
+ ///
+ public static LocalisableString SometimesSeasonalBackground => new TranslatableString(getKey(@"sometimes_seasonal_backgrounds"), @"Sometimes");
+
+ ///
+ /// "Sequential"
+ ///
+ public static LocalisableString SequentialHotkeyStyle => new TranslatableString(getKey(@"mods_sequential_hotkeys"), @"Sequential");
+
+ ///
+ /// "Classic"
+ ///
+ public static LocalisableString ClassicHotkeyStyle => new TranslatableString(getKey(@"mods_classic_hotkeys"), @"Classic");
+
+ ///
+ /// "Never repeat"
+ ///
+ public static LocalisableString NeverRepeat => new TranslatableString(getKey(@"never_repeat_random"), @"Never repeat");
+
+ ///
+ /// "True Random"
+ ///
+ public static LocalisableString TrueRandom => new TranslatableString(getKey(@"true_random"), @"True Random");
+
private static string getKey(string key) => $"{prefix}:{key}";
}
}
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 7af19f6dd1..a0c8e0d555 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -104,120 +104,39 @@ namespace osu.Game.Online.API
///
private int failureCount;
+ ///
+ /// The main API thread loop, which will continue to run until the game is shut down.
+ ///
private void run()
{
while (!cancellationToken.IsCancellationRequested)
{
- switch (State.Value)
+ if (state.Value == APIState.Failing)
{
- case APIState.Failing:
- //todo: replace this with a ping request.
- log.Add(@"In a failing state, waiting a bit before we try again...");
- Thread.Sleep(5000);
+ // To recover from a failing state, falling through and running the full reconnection process seems safest for now.
+ // This could probably be replaced with a ping-style request if we want to avoid the reconnection overheads.
+ log.Add($@"{nameof(APIAccess)} is in a failing state, waiting a bit before we try again...");
+ Thread.Sleep(5000);
+ }
- if (!IsLoggedIn) goto case APIState.Connecting;
+ // Ensure that we have valid credentials.
+ // If not, setting the offline state will allow the game to prompt the user to provide new credentials.
+ if (!HasLogin)
+ {
+ state.Value = APIState.Offline;
+ Thread.Sleep(50);
+ continue;
+ }
- if (queue.Count == 0)
- {
- log.Add(@"Queueing a ping request");
- Queue(new GetUserRequest());
- }
+ Debug.Assert(HasLogin);
- break;
+ // Ensure that we are in an online state. If not, attempt a connect.
+ if (state.Value != APIState.Online)
+ {
+ attemptConnect();
- case APIState.Offline:
- case APIState.Connecting:
- // work to restore a connection...
- if (!HasLogin)
- {
- state.Value = APIState.Offline;
- Thread.Sleep(50);
- continue;
- }
-
- state.Value = APIState.Connecting;
-
- // save the username at this point, if the user requested for it to be.
- config.SetValue(OsuSetting.Username, config.Get(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
-
- if (!authentication.HasValidAccessToken)
- {
- LastLoginError = null;
-
- try
- {
- authentication.AuthenticateWithLogin(ProvidedUsername, password);
- }
- catch (Exception e)
- {
- //todo: this fails even on network-related issues. we should probably handle those differently.
- LastLoginError = e;
- log.Add(@"Login failed!");
- password = null;
- authentication.Clear();
- continue;
- }
- }
-
- var userReq = new GetUserRequest();
-
- userReq.Failure += ex =>
- {
- if (ex is APIException)
- {
- LastLoginError = ex;
- log.Add("Login failed on local user retrieval!");
- Logout();
- }
- else if (ex is WebException webException && webException.Message == @"Unauthorized")
- {
- log.Add(@"Login no longer valid");
- Logout();
- }
- else
- failConnectionProcess();
- };
- userReq.Success += u =>
- {
- localUser.Value = u;
-
- // todo: save/pull from settings
- localUser.Value.Status.Value = new UserStatusOnline();
-
- failureCount = 0;
- };
-
- if (!handleRequest(userReq))
- {
- failConnectionProcess();
- continue;
- }
-
- // getting user's friends is considered part of the connection process.
- var friendsReq = new GetFriendsRequest();
-
- friendsReq.Failure += _ => failConnectionProcess();
- friendsReq.Success += res =>
- {
- friends.AddRange(res);
-
- //we're connected!
- state.Value = APIState.Online;
- };
-
- if (!handleRequest(friendsReq))
- {
- failConnectionProcess();
- continue;
- }
-
- // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
- // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
- // before actually going online.
- while (State.Value > APIState.Offline && State.Value < APIState.Online)
- Thread.Sleep(500);
-
- break;
+ if (state.Value != APIState.Online)
+ continue;
}
// hard bail if we can't get a valid access token.
@@ -227,31 +146,132 @@ namespace osu.Game.Online.API
continue;
}
- while (true)
- {
- APIRequest req;
-
- lock (queue)
- {
- if (queue.Count == 0) break;
-
- req = queue.Dequeue();
- }
-
- handleRequest(req);
- }
-
+ processQueuedRequests();
Thread.Sleep(50);
}
+ }
- void failConnectionProcess()
+ ///
+ /// Dequeue from the queue and run each request synchronously until the queue is empty.
+ ///
+ private void processQueuedRequests()
+ {
+ while (true)
{
- // if something went wrong during the connection process, we want to reset the state (but only if still connecting).
- if (State.Value == APIState.Connecting)
- state.Value = APIState.Failing;
+ APIRequest req;
+
+ lock (queue)
+ {
+ if (queue.Count == 0) return;
+
+ req = queue.Dequeue();
+ }
+
+ handleRequest(req);
}
}
+ ///
+ /// From a non-connected state, perform a full connection flow, obtaining OAuth tokens and populating the local user and friends.
+ ///
+ ///
+ /// This method takes control of and transitions from to either
+ /// - (successful connection)
+ /// - (failed connection but retrying)
+ /// - (failed and can't retry, clear credentials and require user interaction)
+ ///
+ /// Whether the connection attempt was successful.
+ private void attemptConnect()
+ {
+ state.Value = APIState.Connecting;
+
+ if (localUser.IsDefault)
+ {
+ // Show a placeholder user if saved credentials are available.
+ // This is useful for storing local scores and showing a placeholder username after starting the game,
+ // until a valid connection has been established.
+ setLocalUser(new APIUser
+ {
+ Username = ProvidedUsername,
+ });
+ }
+
+ // save the username at this point, if the user requested for it to be.
+ config.SetValue(OsuSetting.Username, config.Get(OsuSetting.SaveUsername) ? ProvidedUsername : string.Empty);
+
+ if (!authentication.HasValidAccessToken)
+ {
+ LastLoginError = null;
+
+ try
+ {
+ authentication.AuthenticateWithLogin(ProvidedUsername, password);
+ }
+ catch (Exception e)
+ {
+ //todo: this fails even on network-related issues. we should probably handle those differently.
+ LastLoginError = e;
+ log.Add($@"Login failed for username {ProvidedUsername} ({LastLoginError.Message})!");
+
+ Logout();
+ return;
+ }
+ }
+
+ var userReq = new GetUserRequest();
+ userReq.Failure += ex =>
+ {
+ if (ex is APIException)
+ {
+ LastLoginError = ex;
+ log.Add($@"Login failed for username {ProvidedUsername} on user retrieval ({LastLoginError.Message})!");
+ Logout();
+ }
+ else if (ex is WebException webException && webException.Message == @"Unauthorized")
+ {
+ log.Add(@"Login no longer valid");
+ Logout();
+ }
+ else
+ {
+ state.Value = APIState.Failing;
+ }
+ };
+ userReq.Success += user =>
+ {
+ // todo: save/pull from settings
+ user.Status.Value = new UserStatusOnline();
+
+ setLocalUser(user);
+
+ // we're connected!
+ state.Value = APIState.Online;
+ failureCount = 0;
+ };
+
+ if (!handleRequest(userReq))
+ {
+ state.Value = APIState.Failing;
+ return;
+ }
+
+ var friendsReq = new GetFriendsRequest();
+ friendsReq.Failure += _ => state.Value = APIState.Failing;
+ friendsReq.Success += res => friends.AddRange(res);
+
+ if (!handleRequest(friendsReq))
+ {
+ state.Value = APIState.Failing;
+ return;
+ }
+
+ // The Success callback event is fired on the main thread, so we should wait for that to run before proceeding.
+ // Without this, we will end up circulating this Connecting loop multiple times and queueing up many web requests
+ // before actually going online.
+ while (State.Value == APIState.Connecting && !cancellationToken.IsCancellationRequested)
+ Thread.Sleep(500);
+ }
+
public void Perform(APIRequest request)
{
try
@@ -327,8 +347,7 @@ namespace osu.Game.Online.API
if (req.CompletionState != APIRequestCompletionState.Completed)
return false;
- // we could still be in initialisation, at which point we don't want to say we're Online yet.
- if (IsLoggedIn) state.Value = APIState.Online;
+ // Reset failure count if this request succeeded.
failureCount = 0;
return true;
}
@@ -402,7 +421,7 @@ namespace osu.Game.Online.API
}
}
- public bool IsLoggedIn => localUser.Value.Id > 1; // TODO: should this also be true if attempting to connect?
+ public bool IsLoggedIn => State.Value > APIState.Offline;
public void Queue(APIRequest request)
{
@@ -442,7 +461,7 @@ namespace osu.Game.Online.API
// Scheduled prior to state change such that the state changed event is invoked with the correct user and their friends present
Schedule(() =>
{
- localUser.Value = createGuestUser();
+ setLocalUser(createGuestUser());
friends.Clear();
});
@@ -452,6 +471,8 @@ namespace osu.Game.Online.API
private static APIUser createGuestUser() => new GuestUser();
+ private void setLocalUser(APIUser user) => Scheduler.Add(() => localUser.Value = user, false);
+
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
diff --git a/osu.Game/Online/API/IAPIProvider.cs b/osu.Game/Online/API/IAPIProvider.cs
index 812aa7f09f..a90b11e354 100644
--- a/osu.Game/Online/API/IAPIProvider.cs
+++ b/osu.Game/Online/API/IAPIProvider.cs
@@ -13,19 +13,16 @@ namespace osu.Game.Online.API
{
///
/// The local user.
- /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
///
IBindable LocalUser { get; }
///
/// The user's friends.
- /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
///
IBindableList Friends { get; }
///
/// The current user's activity.
- /// This is not thread-safe and should be scheduled locally if consumed from a drawable component.
///
IBindable Activity { get; }
diff --git a/osu.Game/Online/Multiplayer/MultiplayerClient.cs b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
index 603bd10c38..04b87c19da 100644
--- a/osu.Game/Online/Multiplayer/MultiplayerClient.cs
+++ b/osu.Game/Online/Multiplayer/MultiplayerClient.cs
@@ -196,6 +196,9 @@ namespace osu.Game.Online.Multiplayer
APIRoom.Playlist.AddRange(joinedRoom.Playlist.Select(createPlaylistItem));
APIRoom.CurrentPlaylistItem.Value = APIRoom.Playlist.Single(item => item.ID == joinedRoom.Settings.PlaylistItemId);
+ // The server will null out the end date upon the host joining the room, but the null value is never communicated to the client.
+ APIRoom.EndDate.Value = null;
+
Debug.Assert(LocalUser != null);
addUserToAPIRoom(LocalUser);
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 78cc4d7f70..f7747c5d64 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -1138,6 +1138,13 @@ namespace osu.Game
mouseDisableButtons.Value = !mouseDisableButtons.Value;
return true;
+ case GlobalAction.ToggleProfile:
+ if (userProfile.State.Value == Visibility.Visible)
+ userProfile.Hide();
+ else
+ ShowUser(API.LocalUser.Value);
+ return true;
+
case GlobalAction.RandomSkin:
// Don't allow random skin selection while in the skin editor.
// This is mainly to stop many "osu! default (modified)" skins being created via the SkinManager.EnsureMutableSkin() path.
diff --git a/osu.Game/Overlays/BeatmapListingOverlay.cs b/osu.Game/Overlays/BeatmapListingOverlay.cs
index cfa53009ef..3136492af0 100644
--- a/osu.Game/Overlays/BeatmapListingOverlay.cs
+++ b/osu.Game/Overlays/BeatmapListingOverlay.cs
@@ -104,11 +104,11 @@ namespace osu.Game.Overlays
filterControl.CardSize.BindValueChanged(_ => onCardSizeChanged());
apiUser = api.LocalUser.GetBoundCopy();
- apiUser.BindValueChanged(_ =>
+ apiUser.BindValueChanged(_ => Schedule(() =>
{
if (api.IsLoggedIn)
addContentToResultsArea(Drawable.Empty());
- });
+ }));
}
public void ShowWithSearch(string query)
diff --git a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
index e94a1b0147..8fc011b2bf 100644
--- a/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
+++ b/osu.Game/Overlays/Comments/CommentMarkdownContainer.cs
@@ -4,7 +4,6 @@
#nullable disable
using Markdig.Syntax;
-using Markdig.Syntax.Inlines;
using osu.Framework.Graphics.Containers.Markdown;
using osu.Game.Graphics.Containers.Markdown;
@@ -12,16 +11,8 @@ namespace osu.Game.Overlays.Comments
{
public class CommentMarkdownContainer : OsuMarkdownContainer
{
- public override MarkdownTextFlowContainer CreateTextFlow() => new CommentMarkdownTextFlowContainer();
-
protected override MarkdownHeading CreateHeading(HeadingBlock headingBlock) => new CommentMarkdownHeading(headingBlock);
- private class CommentMarkdownTextFlowContainer : OsuMarkdownTextFlowContainer
- {
- // Don't render image in comment for now
- protected override void AddImage(LinkInline linkInline) { }
- }
-
private class CommentMarkdownHeading : OsuMarkdownHeading
{
public CommentMarkdownHeading(HeadingBlock headingBlock)
diff --git a/osu.Game/Overlays/Login/LoginPanel.cs b/osu.Game/Overlays/Login/LoginPanel.cs
index 1d8926b991..32a7fca1a6 100644
--- a/osu.Game/Overlays/Login/LoginPanel.cs
+++ b/osu.Game/Overlays/Login/LoginPanel.cs
@@ -13,6 +13,7 @@ using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
using osu.Game.Online.API;
using osu.Game.Users;
using osuTK;
@@ -109,7 +110,7 @@ namespace osu.Game.Overlays.Login
Origin = Anchor.TopCentre,
TextAnchor = Anchor.TopCentre,
AutoSizeAxes = Axes.Both,
- Text = state.NewValue == APIState.Failing ? "Connection is failing, will attempt to reconnect... " : "Attempting to connect... ",
+ Text = state.NewValue == APIState.Failing ? ToolbarStrings.AttemptingToReconnect : ToolbarStrings.Connecting,
Margin = new MarginPadding { Top = 10, Bottom = 10 },
},
};
diff --git a/osu.Game/Overlays/Mods/Input/ModSelectHotkeyStyle.cs b/osu.Game/Overlays/Mods/Input/ModSelectHotkeyStyle.cs
index 6375b37f8b..abb7a804da 100644
--- a/osu.Game/Overlays/Mods/Input/ModSelectHotkeyStyle.cs
+++ b/osu.Game/Overlays/Mods/Input/ModSelectHotkeyStyle.cs
@@ -1,7 +1,9 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
+using osu.Framework.Localisation;
using osu.Game.Rulesets.Mods;
+using osu.Game.Localisation;
namespace osu.Game.Overlays.Mods.Input
{
@@ -15,6 +17,7 @@ namespace osu.Game.Overlays.Mods.Input
/// Individual letters in a row trigger the mods in a sequential fashion.
/// Uses .
///
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.SequentialHotkeyStyle))]
Sequential,
///
@@ -22,6 +25,7 @@ namespace osu.Game.Overlays.Mods.Input
/// One keybinding can toggle between what used to be s on stable,
/// and some mods in a column may not have any hotkeys at all.
///
+ [LocalisableDescription(typeof(UserInterfaceStrings), nameof(UserInterfaceStrings.ClassicHotkeyStyle))]
Classic
}
}
diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 1c40c8c6e5..7a2c727a00 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Mods
private IModHotkeyHandler hotkeyHandler = null!;
private Task? latestLoadTask;
- internal bool ItemsLoaded => latestLoadTask == null;
+ internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true;
public ModColumn(ModType modType, bool allowIncompatibleSelection)
{
@@ -132,18 +132,11 @@ namespace osu.Game.Overlays.Mods
var panels = availableMods.Select(mod => CreateModPanel(mod).With(panel => panel.Shear = Vector2.Zero));
- Task? loadTask;
-
- latestLoadTask = loadTask = LoadComponentsAsync(panels, loaded =>
+ latestLoadTask = LoadComponentsAsync(panels, loaded =>
{
ItemsFlow.ChildrenEnumerable = loaded;
updateState();
}, (cancellationTokenSource = new CancellationTokenSource()).Token);
- loadTask.ContinueWith(_ =>
- {
- if (loadTask == latestLoadTask)
- latestLoadTask = null;
- });
}
private void updateState()
diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index 7f453637e7..176c527a10 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -2,12 +2,12 @@
// See the LICENCE file in the repository root for full licence text.
using System;
-using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Graphics;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Localisation;
@@ -50,45 +50,41 @@ namespace osu.Game.Overlays.Mods
{
presetSubscription?.Dispose();
presetSubscription = realm.RegisterForNotifications(r =>
- r.All()
- .Filter($"{nameof(ModPreset.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $0"
- + $" && {nameof(ModPreset.DeletePending)} == false", ruleset.Value.ShortName)
- .OrderBy(preset => preset.Name),
- (presets, _, _) => asyncLoadPanels(presets));
+ r.All()
+ .Filter($"{nameof(ModPreset.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $0"
+ + $" && {nameof(ModPreset.DeletePending)} == false", ruleset.Value.ShortName)
+ .OrderBy(preset => preset.Name), asyncLoadPanels);
}
private CancellationTokenSource? cancellationTokenSource;
private Task? latestLoadTask;
- internal bool ItemsLoaded => latestLoadTask == null;
+ internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true;
- private void asyncLoadPanels(IReadOnlyList presets)
+ private void asyncLoadPanels(IRealmCollection presets, ChangeSet changes, Exception error)
{
cancellationTokenSource?.Cancel();
if (!presets.Any())
{
- ItemsFlow.RemoveAll(panel => panel is ModPresetPanel);
+ removeAndDisposePresetPanels();
return;
}
- var panels = presets.Select(preset => new ModPresetPanel(preset.ToLive(realm))
+ latestLoadTask = LoadComponentsAsync(presets.Select(p => new ModPresetPanel(p.ToLive(realm))
{
Shear = Vector2.Zero
- });
-
- Task? loadTask;
-
- latestLoadTask = loadTask = LoadComponentsAsync(panels, loaded =>
+ }), loaded =>
{
- ItemsFlow.RemoveAll(panel => panel is ModPresetPanel);
+ removeAndDisposePresetPanels();
ItemsFlow.AddRange(loaded);
}, (cancellationTokenSource = new CancellationTokenSource()).Token);
- loadTask.ContinueWith(_ =>
+
+ void removeAndDisposePresetPanels()
{
- if (loadTask == latestLoadTask)
- latestLoadTask = null;
- });
+ foreach (var panel in ItemsFlow.OfType().ToArray())
+ panel.RemoveAndDisposeImmediately();
+ }
}
protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs
index 2bb0ff1085..15fc54a337 100644
--- a/osu.Game/Overlays/Music/Playlist.cs
+++ b/osu.Game/Overlays/Music/Playlist.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Linq;
using osu.Framework.Bindables;
@@ -17,10 +15,12 @@ namespace osu.Game.Overlays.Music
{
public class Playlist : OsuRearrangeableListContainer>
{
- public Action> RequestSelection;
+ public Action>? RequestSelection;
public readonly Bindable> SelectedSet = new Bindable>();
+ private FilterCriteria currentCriteria = new FilterCriteria();
+
public new MarginPadding Padding
{
get => base.Padding;
@@ -31,26 +31,22 @@ namespace osu.Game.Overlays.Music
{
var items = (SearchContainer>>)ListContainer;
- string[] currentCollectionHashes = criteria.Collection?.PerformRead(c => c.BeatmapMD5Hashes.ToArray());
+ string[]? currentCollectionHashes = criteria.Collection?.PerformRead(c => c.BeatmapMD5Hashes.ToArray());
foreach (var item in items.OfType())
{
- if (currentCollectionHashes == null)
- item.InSelectedCollection = true;
- else
- {
- item.InSelectedCollection = item.Model.Value.Beatmaps.Select(b => b.MD5Hash)
- .Any(currentCollectionHashes.Contains);
- }
+ item.InSelectedCollection = currentCollectionHashes == null || item.Model.Value.Beatmaps.Select(b => b.MD5Hash).Any(currentCollectionHashes.Contains);
}
items.SearchTerm = criteria.SearchText;
+ currentCriteria = criteria;
}
- public Live FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
+ public Live? FirstVisibleSet => Items.FirstOrDefault(i => ((PlaylistItem)ItemMap[i]).MatchingFilter);
protected override OsuRearrangeableListItem> CreateOsuDrawable(Live item) => new PlaylistItem(item)
{
+ InSelectedCollection = currentCriteria.Collection?.PerformRead(c => item.Value.Beatmaps.Select(b => b.MD5Hash).Any(c.BeatmapMD5Hashes.Contains)) != false,
SelectedSet = { BindTarget = SelectedSet },
RequestSelection = set => RequestSelection?.Invoke(set)
};
diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index e33fc8064f..9fe2fd5279 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Overlays.Music
private const float transition_duration = 600;
private const float playlist_height = 510;
- public IBindableList> BeatmapSets => beatmapSets;
-
private readonly BindableList> beatmapSets = new BindableList>();
private readonly Bindable beatmap = new Bindable();
@@ -104,9 +102,7 @@ namespace osu.Game.Overlays.Music
{
base.LoadComplete();
- // tests might bind externally, in which case we don't want to involve realm.
- if (beatmapSets.Count == 0)
- beatmapSubscription = realm.RegisterForNotifications(r => r.All().Where(s => !s.DeletePending), beatmapsChanged);
+ beatmapSubscription = realm.RegisterForNotifications(r => r.All().Where(s => !s.DeletePending), beatmapsChanged);
list.Items.BindTo(beatmapSets);
beatmap.BindValueChanged(working => list.SelectedSet.Value = working.NewValue.BeatmapSetInfo.ToLive(realm), true);
diff --git a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
index a2e07065f1..7ab10a3c3a 100644
--- a/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/Input/GlobalKeyBindingsSection.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
@@ -23,6 +21,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
public GlobalKeyBindingsSection(GlobalActionContainer manager)
{
Add(new DefaultBindingsSubsection(manager));
+ Add(new OverlayBindingsSubsection(manager));
Add(new AudioControlKeyBindingsSubsection(manager));
Add(new SongSelectKeyBindingSubsection(manager));
Add(new InGameKeyBindingsSubsection(manager));
@@ -40,6 +39,17 @@ namespace osu.Game.Overlays.Settings.Sections.Input
}
}
+ private class OverlayBindingsSubsection : KeyBindingsSubsection
+ {
+ protected override LocalisableString Header => InputSettingsStrings.OverlaysSection;
+
+ public OverlayBindingsSubsection(GlobalActionContainer manager)
+ : base(null)
+ {
+ Defaults = manager.OverlayKeyBindings;
+ }
+ }
+
private class SongSelectKeyBindingSubsection : KeyBindingsSubsection
{
protected override LocalisableString Header => InputSettingsStrings.SongSelectSection;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
index a93ba17c5b..4ebd19a1f7 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarUserButton.cs
@@ -1,17 +1,19 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
+using System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Effects;
+using osu.Framework.Graphics.Sprites;
using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
+using osu.Game.Localisation;
using osu.Game.Online.API;
using osu.Game.Online.API.Requests.Responses;
-using osu.Game.Resources.Localisation.Web;
using osu.Game.Users.Drawables;
using osuTK;
using osuTK.Graphics;
@@ -20,59 +22,103 @@ namespace osu.Game.Overlays.Toolbar
{
public class ToolbarUserButton : ToolbarOverlayToggleButton
{
- private readonly UpdateableAvatar avatar;
+ private UpdateableAvatar avatar = null!;
- [Resolved]
- private IAPIProvider api { get; set; }
+ private IBindable localUser = null!;
- private readonly IBindable apiState = new Bindable();
+ private LoadingSpinner spinner = null!;
+
+ private SpriteIcon failingIcon = null!;
+
+ private IBindable apiState = null!;
public ToolbarUserButton()
{
AutoSizeAxes = Axes.X;
+ }
- DrawableText.Font = OsuFont.GetFont(italics: true);
-
+ [BackgroundDependencyLoader]
+ private void load(OsuColour colours, IAPIProvider api, LoginOverlay? login)
+ {
Add(new OpaqueBackground { Depth = 1 });
- Flow.Add(avatar = new UpdateableAvatar(isInteractive: false)
+ Flow.Add(new Container
{
Masking = true,
+ CornerRadius = 4,
Size = new Vector2(32),
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
- CornerRadius = 4,
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 4,
Colour = Color4.Black.Opacity(0.1f),
+ },
+ Children = new Drawable[]
+ {
+ avatar = new UpdateableAvatar(isInteractive: false)
+ {
+ RelativeSizeAxes = Axes.Both,
+ },
+ spinner = new LoadingLayer(dimBackground: true, withBox: false, blockInput: false)
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ RelativeSizeAxes = Axes.Both,
+ },
+ failingIcon = new SpriteIcon
+ {
+ Anchor = Anchor.Centre,
+ Origin = Anchor.Centre,
+ Alpha = 0,
+ Size = new Vector2(0.3f),
+ Icon = FontAwesome.Solid.ExclamationTriangle,
+ RelativeSizeAxes = Axes.Both,
+ Colour = colours.YellowLight,
+ },
}
});
- }
- [BackgroundDependencyLoader(true)]
- private void load(LoginOverlay login)
- {
- apiState.BindTo(api.State);
+ apiState = api.State.GetBoundCopy();
apiState.BindValueChanged(onlineStateChanged, true);
+ localUser = api.LocalUser.GetBoundCopy();
+ localUser.BindValueChanged(userChanged, true);
+
StateContainer = login;
}
+ private void userChanged(ValueChangedEvent user) => Schedule(() =>
+ {
+ Text = user.NewValue.Username;
+ avatar.User = user.NewValue;
+ });
+
private void onlineStateChanged(ValueChangedEvent state) => Schedule(() =>
{
+ failingIcon.FadeTo(state.NewValue == APIState.Failing ? 1 : 0, 200, Easing.OutQuint);
+
switch (state.NewValue)
{
- default:
- Text = UsersStrings.AnonymousUsername;
- avatar.User = new APIUser();
+ case APIState.Connecting:
+ TooltipText = ToolbarStrings.Connecting;
+ spinner.Show();
break;
- case APIState.Online:
- Text = api.LocalUser.Value.Username;
- avatar.User = api.LocalUser.Value;
+ case APIState.Failing:
+ TooltipText = ToolbarStrings.AttemptingToReconnect;
+ spinner.Show();
break;
+
+ case APIState.Offline:
+ case APIState.Online:
+ TooltipText = string.Empty;
+ spinner.Hide();
+ break;
+
+ default:
+ throw new ArgumentOutOfRangeException();
}
});
}
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs b/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
index 93fb7b9ab8..a66c00d78b 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckAudioInVideo.cs
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.IO;
+using osu.Game.Beatmaps;
using osu.Game.IO.FileAbstraction;
using osu.Game.Rulesets.Edit.Checks.Components;
using osu.Game.Storyboards;
diff --git a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
index b15a9f5331..be0c4501e7 100644
--- a/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
+++ b/osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.IO;
+using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
namespace osu.Game.Rulesets.Edit.Checks
diff --git a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
index 38d26ed05a..7b84db844b 100644
--- a/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
+++ b/osu.Game/Rulesets/Mods/ModAdaptiveSpeed.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Mods
public override ModType Type => ModType.Fun;
- public override double ScoreMultiplier => 1;
+ public override double ScoreMultiplier => 0.5;
public override bool ValidForMultiplayer => false;
public override bool ValidForMultiplayerAsFreeMod => false;
diff --git a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
index eefa1531c4..b7435ec3ec 100644
--- a/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
+++ b/osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Mods
public override IconUsage? Icon => FontAwesome.Solid.Hammer;
- public override double ScoreMultiplier => 1.0;
+ public override double ScoreMultiplier => 0.5;
public override bool RequiresConfiguration => true;
diff --git a/osu.Game/Rulesets/Mods/ModRelax.cs b/osu.Game/Rulesets/Mods/ModRelax.cs
index e5995ff180..49c10339ee 100644
--- a/osu.Game/Rulesets/Mods/ModRelax.cs
+++ b/osu.Game/Rulesets/Mods/ModRelax.cs
@@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Mods
public override string Acronym => "RX";
public override IconUsage? Icon => OsuIcon.ModRelax;
public override ModType Type => ModType.Automation;
- public override double ScoreMultiplier => 1;
+ public override double ScoreMultiplier => 0.1;
public override Type[] IncompatibleMods => new[] { typeof(ModAutoplay), typeof(ModNoFail), typeof(ModFailCondition) };
}
}
diff --git a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
index 59fee0f97b..1deac9f08a 100644
--- a/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
+++ b/osu.Game/Rulesets/Scoring/ScoreProcessor.cs
@@ -16,6 +16,8 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Replays;
using osu.Game.Scoring;
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
namespace osu.Game.Rulesets.Scoring
{
@@ -636,7 +638,10 @@ namespace osu.Game.Rulesets.Scoring
public enum ScoringMode
{
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.StandardisedScoreDisplay))]
Standardised,
+
+ [LocalisableDescription(typeof(GameplaySettingsStrings), nameof(GameplaySettingsStrings.ClassicScoreDisplay))]
Classic
}
}
diff --git a/osu.Game/Rulesets/UI/DrawableRuleset.cs b/osu.Game/Rulesets/UI/DrawableRuleset.cs
index f7f62d2af0..59c1146995 100644
--- a/osu.Game/Rulesets/UI/DrawableRuleset.cs
+++ b/osu.Game/Rulesets/UI/DrawableRuleset.cs
@@ -67,7 +67,7 @@ namespace osu.Game.Rulesets.UI
public override Container FrameStableComponents { get; } = new Container { RelativeSizeAxes = Axes.Both };
- public override IFrameStableClock FrameStableClock => frameStabilityContainer.FrameStableClock;
+ public override IFrameStableClock FrameStableClock => frameStabilityContainer;
private bool frameStablePlayback = true;
diff --git a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
index dcd7141419..e41802808f 100644
--- a/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
+++ b/osu.Game/Rulesets/UI/FrameStabilityContainer.cs
@@ -1,16 +1,16 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Timing;
+using osu.Framework.Utils;
using osu.Game.Input.Handlers;
using osu.Game.Screens.Play;
@@ -20,9 +20,11 @@ namespace osu.Game.Rulesets.UI
/// A container which consumes a parent gameplay clock and standardises frame counts for children.
/// Will ensure a minimum of 50 frames per clock second is maintained, regardless of any system lag or seeks.
///
- public class FrameStabilityContainer : Container, IHasReplayHandler
+ [Cached(typeof(IGameplayClock))]
+ [Cached(typeof(IFrameStableClock))]
+ public sealed class FrameStabilityContainer : Container, IHasReplayHandler, IFrameStableClock, IGameplayClock
{
- private readonly double gameplayStartTime;
+ public ReplayInputHandler? ReplayInputHandler { get; set; }
///
/// The number of frames (per parent frame) which can be run in an attempt to catch-up to real-time.
@@ -32,28 +34,35 @@ namespace osu.Game.Rulesets.UI
///
/// Whether to enable frame-stable playback.
///
- internal bool FrameStablePlayback = true;
+ internal bool FrameStablePlayback { get; set; } = true;
- public IFrameStableClock FrameStableClock => frameStableClock;
+ protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate && state != PlaybackState.NotValid;
- [Cached(typeof(GameplayClock))]
- private readonly FrameStabilityClock frameStableClock;
+ private readonly Bindable isCatchingUp = new Bindable();
- public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
- {
- RelativeSizeAxes = Axes.Both;
+ private readonly Bindable waitingOnFrames = new Bindable();
- frameStableClock = new FrameStabilityClock(framedClock = new FramedClock(manualClock = new ManualClock()));
+ private readonly double gameplayStartTime;
- this.gameplayStartTime = gameplayStartTime;
- }
+ private IGameplayClock? parentGameplayClock;
+ ///
+ /// A clock which is used as reference for time, rate and running state.
+ ///
+ private IClock referenceClock = null!;
+
+ ///
+ /// A local manual clock which tracks the reference clock.
+ /// Values are transferred from each update call.
+ ///
private readonly ManualClock manualClock;
+ ///
+ /// The main framed clock which has stability applied to it.
+ /// This gets exposed to children as an .
+ ///
private readonly FramedClock framedClock;
- private IFrameBasedClock parentGameplayClock;
-
///
/// The current direction of playback to be exposed to frame stable children.
///
@@ -62,32 +71,34 @@ namespace osu.Game.Rulesets.UI
///
private int direction = 1;
- [BackgroundDependencyLoader(true)]
- private void load(GameplayClock clock)
- {
- if (clock != null)
- {
- parentGameplayClock = frameStableClock.ParentGameplayClock = clock;
- frameStableClock.IsPaused.BindTo(clock.IsPaused);
- }
- }
-
- protected override void LoadComplete()
- {
- base.LoadComplete();
- setClock();
- }
-
private PlaybackState state;
- protected override bool RequiresChildrenUpdate => base.RequiresChildrenUpdate && state != PlaybackState.NotValid;
-
private bool hasReplayAttached => ReplayInputHandler != null;
- private const double sixty_frame_time = 1000.0 / 60;
-
private bool firstConsumption = true;
+ public FrameStabilityContainer(double gameplayStartTime = double.MinValue)
+ {
+ RelativeSizeAxes = Axes.Both;
+
+ framedClock = new FramedClock(manualClock = new ManualClock());
+
+ this.gameplayStartTime = gameplayStartTime;
+ }
+
+ [BackgroundDependencyLoader]
+ private void load(IGameplayClock? gameplayClock)
+ {
+ if (gameplayClock != null)
+ {
+ parentGameplayClock = gameplayClock;
+ IsPaused.BindTo(parentGameplayClock.IsPaused);
+ }
+
+ referenceClock = gameplayClock ?? Clock;
+ Clock = this;
+ }
+
public override bool UpdateSubTree()
{
int loops = MaxCatchUpFrames;
@@ -110,12 +121,12 @@ namespace osu.Game.Rulesets.UI
private void updateClock()
{
- if (frameStableClock.WaitingOnFrames.Value)
+ if (waitingOnFrames.Value)
{
// if waiting on frames, run one update loop to determine if frames have arrived.
state = PlaybackState.Valid;
}
- else if (frameStableClock.IsPaused.Value)
+ else if (IsPaused.Value)
{
// time should not advance while paused, nor should anything run.
state = PlaybackState.NotValid;
@@ -126,10 +137,7 @@ namespace osu.Game.Rulesets.UI
state = PlaybackState.Valid;
}
- if (parentGameplayClock == null)
- setClock(); // LoadComplete may not be run yet, but we still want the clock.
-
- double proposedTime = parentGameplayClock.CurrentTime;
+ double proposedTime = referenceClock.CurrentTime;
if (FrameStablePlayback)
// if we require frame stability, the proposed time will be adjusted to move at most one known
@@ -149,14 +157,14 @@ namespace osu.Game.Rulesets.UI
if (state == PlaybackState.Valid && proposedTime != manualClock.CurrentTime)
direction = proposedTime >= manualClock.CurrentTime ? 1 : -1;
- double timeBehind = Math.Abs(proposedTime - parentGameplayClock.CurrentTime);
+ double timeBehind = Math.Abs(proposedTime - referenceClock.CurrentTime);
- frameStableClock.IsCatchingUp.Value = timeBehind > 200;
- frameStableClock.WaitingOnFrames.Value = state == PlaybackState.NotValid;
+ isCatchingUp.Value = timeBehind > 200;
+ waitingOnFrames.Value = state == PlaybackState.NotValid;
manualClock.CurrentTime = proposedTime;
- manualClock.Rate = Math.Abs(parentGameplayClock.Rate) * direction;
- manualClock.IsRunning = parentGameplayClock.IsRunning;
+ manualClock.Rate = Math.Abs(referenceClock.Rate) * direction;
+ manualClock.IsRunning = referenceClock.IsRunning;
// determine whether catch-up is required.
if (state == PlaybackState.Valid && timeBehind > 0)
@@ -174,6 +182,8 @@ namespace osu.Game.Rulesets.UI
/// Whether playback is still valid.
private bool updateReplay(ref double proposedTime)
{
+ Debug.Assert(ReplayInputHandler != null);
+
double? newTime;
if (FrameStablePlayback)
@@ -210,6 +220,8 @@ namespace osu.Game.Rulesets.UI
/// The time which is to be displayed.
private void applyFrameStability(ref double proposedTime)
{
+ const double sixty_frame_time = 1000.0 / 60;
+
if (firstConsumption)
{
// On the first update, frame-stability seeking would result in unexpected/unwanted behaviour.
@@ -233,20 +245,54 @@ namespace osu.Game.Rulesets.UI
}
}
- private void setClock()
+ #region Delegation of IGameplayClock
+
+ public IBindable IsPaused { get; } = new BindableBool();
+
+ public double CurrentTime => framedClock.CurrentTime;
+
+ public double Rate => framedClock.Rate;
+
+ public bool IsRunning => framedClock.IsRunning;
+
+ public void ProcessFrame() { }
+
+ public double ElapsedFrameTime => framedClock.ElapsedFrameTime;
+
+ public double FramesPerSecond => framedClock.FramesPerSecond;
+
+ public FrameTimeInfo TimeInfo => framedClock.TimeInfo;
+
+ public double TrueGameplayRate
{
- if (parentGameplayClock == null)
+ get
{
- // in case a parent gameplay clock isn't available, just use the parent clock.
- parentGameplayClock ??= Clock;
- }
- else
- {
- Clock = frameStableClock;
+ double baseRate = Rate;
+
+ foreach (double adjustment in NonGameplayAdjustments)
+ {
+ if (Precision.AlmostEquals(adjustment, 0))
+ return 0;
+
+ baseRate /= adjustment;
+ }
+
+ return baseRate;
}
}
- public ReplayInputHandler ReplayInputHandler { get; set; }
+ public double? StartTime => parentGameplayClock?.StartTime;
+
+ public IEnumerable NonGameplayAdjustments => parentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty();
+
+ #endregion
+
+ #region Delegation of IFrameStableClock
+
+ IBindable IFrameStableClock.IsCatchingUp => isCatchingUp;
+ IBindable IFrameStableClock.WaitingOnFrames => waitingOnFrames;
+
+ #endregion
private enum PlaybackState
{
@@ -266,25 +312,5 @@ namespace osu.Game.Rulesets.UI
///
Valid
}
-
- private class FrameStabilityClock : GameplayClock, IFrameStableClock
- {
- public GameplayClock ParentGameplayClock;
-
- public readonly Bindable IsCatchingUp = new Bindable();
-
- public readonly Bindable WaitingOnFrames = new Bindable();
-
- public override IEnumerable> NonGameplayAdjustments => ParentGameplayClock?.NonGameplayAdjustments ?? Enumerable.Empty>();
-
- public FrameStabilityClock(FramedClock underlyingClock)
- : base(underlyingClock)
- {
- }
-
- IBindable IFrameStableClock.IsCatchingUp => IsCatchingUp;
-
- IBindable IFrameStableClock.WaitingOnFrames => WaitingOnFrames;
- }
}
}
diff --git a/osu.Game/Rulesets/UI/IFrameStableClock.cs b/osu.Game/Rulesets/UI/IFrameStableClock.cs
index 132605adaf..569ef5e06c 100644
--- a/osu.Game/Rulesets/UI/IFrameStableClock.cs
+++ b/osu.Game/Rulesets/UI/IFrameStableClock.cs
@@ -1,8 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using osu.Framework.Bindables;
using osu.Framework.Timing;
diff --git a/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
index a4a483e930..79f3a2ca84 100644
--- a/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
+++ b/osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs
@@ -3,12 +3,20 @@
#nullable disable
+using osu.Framework.Localisation;
+using osu.Game.Localisation;
+
namespace osu.Game.Rulesets.UI
{
public enum PlayfieldBorderStyle
{
+ [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.BorderNone))]
None,
+
+ [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.BorderCorners))]
Corners,
+
+ [LocalisableDescription(typeof(RulesetSettingsStrings), nameof(RulesetSettingsStrings.BorderFull))]
Full
}
}
diff --git a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
index 8c14feebbc..69953bf659 100644
--- a/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
+++ b/osu.Game/Screens/Edit/Setup/ResourcesSection.cs
@@ -4,7 +4,6 @@
#nullable disable
using System.IO;
-using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@@ -78,7 +77,7 @@ namespace osu.Game.Screens.Edit.Setup
// remove the previous background for now.
// in the future we probably want to check if this is being used elsewhere (other difficulties?)
- var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.BackgroundFile);
+ var oldFile = set.GetFile(working.Value.Metadata.BackgroundFile);
using (var stream = source.OpenRead())
{
@@ -107,7 +106,7 @@ namespace osu.Game.Screens.Edit.Setup
// remove the previous audio track for now.
// in the future we probably want to check if this is being used elsewhere (other difficulties?)
- var oldFile = set.Files.FirstOrDefault(f => f.Filename == working.Value.Metadata.AudioFile);
+ var oldFile = set.GetFile(working.Value.Metadata.AudioFile);
using (var stream = source.OpenRead())
{
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
index a0558f97a9..68eae76030 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorPlayer.cs
@@ -1,12 +1,8 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
-using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
-using osu.Framework.Timing;
using osu.Game.Beatmaps;
using osu.Game.Scoring;
using osu.Game.Screens.Play;
@@ -26,7 +22,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
///
/// The score containing the player's replay.
/// The clock controlling the gameplay running state.
- public MultiSpectatorPlayer([NotNull] Score score, [NotNull] ISpectatorPlayerClock spectatorPlayerClock)
+ public MultiSpectatorPlayer(Score score, ISpectatorPlayerClock spectatorPlayerClock)
: base(score, new PlayerConfiguration { AllowUserInteraction = false })
{
this.spectatorPlayerClock = spectatorPlayerClock;
@@ -41,6 +37,19 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
HUDOverlay.HoldToQuit.Expire();
}
+ protected override void Update()
+ {
+ // The player clock's running state is controlled externally, but the local pausing state needs to be updated to start/stop gameplay.
+ CatchUpSpectatorPlayerClock catchUpClock = (CatchUpSpectatorPlayerClock)GameplayClockContainer.SourceClock;
+
+ if (catchUpClock.IsRunning)
+ GameplayClockContainer.Start();
+ else
+ GameplayClockContainer.Stop();
+
+ base.Update();
+ }
+
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
@@ -50,28 +59,6 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
}
protected override GameplayClockContainer CreateGameplayClockContainer(WorkingBeatmap beatmap, double gameplayStart)
- => new SpectatorGameplayClockContainer(spectatorPlayerClock);
-
- private class SpectatorGameplayClockContainer : GameplayClockContainer
- {
- public SpectatorGameplayClockContainer([NotNull] IClock sourceClock)
- : base(sourceClock)
- {
- }
-
- protected override void Update()
- {
- // The SourceClock here is always a CatchUpSpectatorPlayerClock.
- // The player clock's running state is controlled externally, but the local pausing state needs to be updated to stop gameplay.
- if (SourceClock.IsRunning)
- Start();
- else
- Stop();
-
- base.Update();
- }
-
- protected override GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
- }
+ => new GameplayClockContainer(spectatorPlayerClock);
}
}
diff --git a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
index 8270bb3b6f..7ed0be50e5 100644
--- a/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
+++ b/osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/MultiSpectatorScreen.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
for (int i = 0; i < Users.Count; i++)
{
- grid.Add(instances[i] = new PlayerArea(Users[i], masterClockContainer.GameplayClock));
+ grid.Add(instances[i] = new PlayerArea(Users[i], masterClockContainer));
syncManager.AddPlayerClock(instances[i].GameplayClock);
}
@@ -231,6 +231,12 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
if (state.State == SpectatedUserState.Passed || state.State == SpectatedUserState.Failed)
return;
+ // we could also potentially receive EndGameplay with "Playing" state, at which point we can only early-return and hope it's a passing player.
+ // todo: this shouldn't exist, but it's here as a hotfix for an issue with multi-spectator screen not proceeding to results screen.
+ // see: https://github.com/ppy/osu/issues/19593
+ if (state.State == SpectatedUserState.Playing)
+ return;
+
RemoveUser(userId);
var instance = instances.Single(i => i.UserId == userId);
diff --git a/osu.Game/Screens/Play/ComboEffects.cs b/osu.Game/Screens/Play/ComboEffects.cs
index 77681401bb..442b061af7 100644
--- a/osu.Game/Screens/Play/ComboEffects.cs
+++ b/osu.Game/Screens/Play/ComboEffects.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Play
private ISamplePlaybackDisabler samplePlaybackDisabler { get; set; }
[Resolved]
- private GameplayClock gameplayClock { get; set; }
+ private IGameplayClock gameplayClock { get; set; }
private void onComboChange(ValueChangedEvent combo)
{
diff --git a/osu.Game/Screens/Play/GameplayClock.cs b/osu.Game/Screens/Play/GameplayClock.cs
index 6af795cfd8..b650922173 100644
--- a/osu.Game/Screens/Play/GameplayClock.cs
+++ b/osu.Game/Screens/Play/GameplayClock.cs
@@ -19,51 +19,39 @@ namespace osu.Game.Screens.Play
/// , as this should only be done once to ensure accuracy.
///
///
- public class GameplayClock : IFrameBasedClock
+ public class GameplayClock : IGameplayClock
{
internal readonly IFrameBasedClock UnderlyingClock;
public readonly BindableBool IsPaused = new BindableBool();
- ///
- /// All adjustments applied to this clock which don't come from gameplay or mods.
- ///
- public virtual IEnumerable> NonGameplayAdjustments => Enumerable.Empty>();
+ IBindable IGameplayClock.IsPaused => IsPaused;
+
+ public virtual IEnumerable NonGameplayAdjustments => Enumerable.Empty();
public GameplayClock(IFrameBasedClock underlyingClock)
{
UnderlyingClock = underlyingClock;
}
- ///
- /// The time from which the clock should start. Will be seeked to on calling .
- ///
- ///
- /// If not set, a value of zero will be used.
- /// Importantly, the value will be inferred from the current ruleset in unless specified.
- ///
public double? StartTime { get; internal set; }
public double CurrentTime => UnderlyingClock.CurrentTime;
public double Rate => UnderlyingClock.Rate;
- ///
- /// The rate of gameplay when playback is at 100%.
- /// This excludes any seeking / user adjustments.
- ///
public double TrueGameplayRate
{
get
{
double baseRate = Rate;
- foreach (var adjustment in NonGameplayAdjustments)
+ foreach (double adjustment in NonGameplayAdjustments)
{
- if (Precision.AlmostEquals(adjustment.Value, 0))
+ if (Precision.AlmostEquals(adjustment, 0))
return 0;
- baseRate /= adjustment.Value;
+ baseRate /= adjustment;
}
return baseRate;
diff --git a/osu.Game/Screens/Play/GameplayClockContainer.cs b/osu.Game/Screens/Play/GameplayClockContainer.cs
index b37d15e06c..27b37094ad 100644
--- a/osu.Game/Screens/Play/GameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/GameplayClockContainer.cs
@@ -1,11 +1,11 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
using System;
+using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
+using osu.Framework.Extensions.ObjectExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Logging;
@@ -16,17 +16,14 @@ namespace osu.Game.Screens.Play
///
/// Encapsulates gameplay timing logic and provides a via DI for gameplay components to use.
///
- public abstract class GameplayClockContainer : Container, IAdjustableClock
+ public class GameplayClockContainer : Container, IAdjustableClock, IGameplayClock
{
- ///
- /// The final clock which is exposed to gameplay components.
- ///
- public GameplayClock GameplayClock { get; private set; }
-
///
/// Whether gameplay is paused.
///
- public readonly BindableBool IsPaused = new BindableBool(true);
+ public IBindable IsPaused => isPaused;
+
+ private readonly BindableBool isPaused = new BindableBool(true);
///
/// The adjustable source clock used for gameplay. Should be used for seeks and clock control.
@@ -36,12 +33,12 @@ namespace osu.Game.Screens.Play
///
/// The source clock.
///
- protected IClock SourceClock { get; private set; }
+ public IClock SourceClock { get; private set; }
///
/// Invoked when a seek has been performed via
///
- public event Action OnSeek;
+ public event Action? OnSeek;
private double? startTime;
@@ -59,16 +56,23 @@ namespace osu.Game.Screens.Play
{
startTime = value;
- if (GameplayClock != null)
+ if (GameplayClock.IsNotNull())
GameplayClock.StartTime = value;
}
}
+ public IEnumerable NonGameplayAdjustments => GameplayClock.NonGameplayAdjustments;
+
+ ///
+ /// The final clock which is exposed to gameplay components.
+ ///
+ protected GameplayClock GameplayClock { get; private set; } = null!;
+
///
/// Creates a new .
///
/// The source used for timing.
- protected GameplayClockContainer(IClock sourceClock)
+ public GameplayClockContainer(IClock sourceClock)
{
SourceClock = sourceClock;
@@ -82,10 +86,12 @@ namespace osu.Game.Screens.Play
{
var dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
- dependencies.CacheAs(GameplayClock = CreateGameplayClock(AdjustableSource));
+ GameplayClock = CreateGameplayClock(AdjustableSource);
+
+ dependencies.CacheAs(this);
GameplayClock.StartTime = StartTime;
- GameplayClock.IsPaused.BindTo(IsPaused);
+ GameplayClock.IsPaused.BindTo(isPaused);
return dependencies;
}
@@ -106,7 +112,7 @@ namespace osu.Game.Screens.Play
AdjustableSource.Start();
}
- IsPaused.Value = false;
+ isPaused.Value = false;
}
///
@@ -128,7 +134,7 @@ namespace osu.Game.Screens.Play
///
/// Stops gameplay.
///
- public void Stop() => IsPaused.Value = true;
+ public void Stop() => isPaused.Value = true;
///
/// Resets this and the source to an initial state ready for gameplay.
@@ -193,7 +199,7 @@ namespace osu.Game.Screens.Play
///
/// The providing the source time.
/// The final .
- protected abstract GameplayClock CreateGameplayClock(IFrameBasedClock source);
+ protected virtual GameplayClock CreateGameplayClock(IFrameBasedClock source) => new GameplayClock(source);
#region IAdjustableClock
@@ -205,9 +211,7 @@ namespace osu.Game.Screens.Play
void IAdjustableClock.Reset() => Reset();
- public void ResetSpeedAdjustments()
- {
- }
+ public void ResetSpeedAdjustments() => throw new NotImplementedException();
double IAdjustableClock.Rate
{
@@ -215,12 +219,25 @@ namespace osu.Game.Screens.Play
set => throw new NotSupportedException();
}
- double IClock.Rate => GameplayClock.Rate;
+ public double Rate => GameplayClock.Rate;
public double CurrentTime => GameplayClock.CurrentTime;
public bool IsRunning => GameplayClock.IsRunning;
#endregion
+
+ public void ProcessFrame()
+ {
+ // Handled via update. Don't process here to safeguard from external usages potentially processing frames additional times.
+ }
+
+ public double ElapsedFrameTime => GameplayClock.ElapsedFrameTime;
+
+ public double FramesPerSecond => GameplayClock.FramesPerSecond;
+
+ public FrameTimeInfo TimeInfo => GameplayClock.TimeInfo;
+
+ public double TrueGameplayRate => GameplayClock.TrueGameplayRate;
}
}
diff --git a/osu.Game/Screens/Play/HUD/SongProgress.cs b/osu.Game/Screens/Play/HUD/SongProgress.cs
index 09afd7a9d3..f368edbfb9 100644
--- a/osu.Game/Screens/Play/HUD/SongProgress.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgress.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Play.HUD
public bool UsesFixedAnchor { get; set; }
[Resolved]
- protected GameplayClock GameplayClock { get; private set; } = null!;
+ protected IGameplayClock GameplayClock { get; private set; } = null!;
[Resolved(canBeNull: true)]
private DrawableRuleset? drawableRuleset { get; set; }
@@ -94,7 +94,10 @@ namespace osu.Game.Screens.Play.HUD
double objectOffsetCurrent = currentTime - FirstHitTime;
double objectDuration = LastHitTime - FirstHitTime;
- UpdateProgress(objectOffsetCurrent / objectDuration, false);
+ if (objectDuration == 0)
+ UpdateProgress(0, false);
+ else
+ UpdateProgress(objectOffsetCurrent / objectDuration, false);
}
}
}
diff --git a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
index 8f10e84509..96a4c5f2bc 100644
--- a/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/HUD/SongProgressInfo.cs
@@ -38,10 +38,10 @@ namespace osu.Game.Screens.Play.HUD
set => endTime = value;
}
- private GameplayClock gameplayClock;
+ private IGameplayClock gameplayClock;
[BackgroundDependencyLoader(true)]
- private void load(OsuColour colours, GameplayClock clock)
+ private void load(OsuColour colours, IGameplayClock clock)
{
if (clock != null)
gameplayClock = clock;
diff --git a/osu.Game/Screens/Play/IGameplayClock.cs b/osu.Game/Screens/Play/IGameplayClock.cs
new file mode 100644
index 0000000000..5f54ce691a
--- /dev/null
+++ b/osu.Game/Screens/Play/IGameplayClock.cs
@@ -0,0 +1,34 @@
+// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using System.Collections.Generic;
+using osu.Framework.Bindables;
+using osu.Framework.Timing;
+
+namespace osu.Game.Screens.Play
+{
+ public interface IGameplayClock : IFrameBasedClock
+ {
+ ///
+ /// The rate of gameplay when playback is at 100%.
+ /// This excludes any seeking / user adjustments.
+ ///
+ double TrueGameplayRate { get; }
+
+ ///
+ /// The time from which the clock should start. Will be seeked to on calling .
+ ///
+ ///
+ /// If not set, a value of zero will be used.
+ /// Importantly, the value will be inferred from the current ruleset in unless specified.
+ ///
+ double? StartTime { get; }
+
+ ///
+ /// All adjustments applied to this clock which don't come from gameplay or mods.
+ ///
+ IEnumerable NonGameplayAdjustments { get; }
+
+ IBindable IsPaused { get; }
+ }
+}
diff --git a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
index d7f6992fee..587d2d40a1 100644
--- a/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
+++ b/osu.Game/Screens/Play/MasterGameplayClockContainer.cs
@@ -303,7 +303,7 @@ namespace osu.Game.Screens.Play
private class MasterGameplayClock : GameplayClock
{
public readonly List> MutableNonGameplayAdjustments = new List>();
- public override IEnumerable> NonGameplayAdjustments => MutableNonGameplayAdjustments;
+ public override IEnumerable NonGameplayAdjustments => MutableNonGameplayAdjustments.Select(b => b.Value);
public MasterGameplayClock(FramedOffsetClock underlyingClock)
: base(underlyingClock)
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index 9c08c77d91..51b2042d1b 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -249,6 +249,9 @@ namespace osu.Game.Screens.Play
// this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
GameplayClockContainer.Add(rulesetSkinProvider);
+ if (cancellationToken.IsCancellationRequested)
+ return;
+
rulesetSkinProvider.AddRange(new Drawable[]
{
failAnimationLayer = new FailAnimation(DrawableRuleset)
@@ -279,6 +282,9 @@ namespace osu.Game.Screens.Play
},
});
+ if (cancellationToken.IsCancellationRequested)
+ return;
+
if (Configuration.AllowRestart)
{
rulesetSkinProvider.Add(new HotkeyRetryOverlay
@@ -324,7 +330,7 @@ namespace osu.Game.Screens.Play
DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updateGameplayState());
// bind clock into components that require it
- DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
+ ((IBindable)DrawableRuleset.IsPaused).BindTo(GameplayClockContainer.IsPaused);
DrawableRuleset.NewResult += r =>
{
@@ -469,7 +475,7 @@ namespace osu.Game.Screens.Play
private void updateSampleDisabledState()
{
- samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.IsCatchingUp.Value || GameplayClockContainer.GameplayClock.IsPaused.Value;
+ samplePlaybackDisabled.Value = DrawableRuleset.FrameStableClock.IsCatchingUp.Value || GameplayClockContainer.IsPaused.Value;
}
private void updatePauseOnFocusLostState()
@@ -871,7 +877,7 @@ namespace osu.Game.Screens.Play
private double? lastPauseActionTime;
protected bool PauseCooldownActive =>
- lastPauseActionTime.HasValue && GameplayClockContainer.GameplayClock.CurrentTime < lastPauseActionTime + pause_cooldown;
+ lastPauseActionTime.HasValue && GameplayClockContainer.CurrentTime < lastPauseActionTime + pause_cooldown;
///
/// A set of conditionals which defines whether the current game state and configuration allows for
@@ -909,7 +915,7 @@ namespace osu.Game.Screens.Play
GameplayClockContainer.Stop();
PauseOverlay.Show();
- lastPauseActionTime = GameplayClockContainer.GameplayClock.CurrentTime;
+ lastPauseActionTime = GameplayClockContainer.CurrentTime;
return true;
}
@@ -999,7 +1005,7 @@ namespace osu.Game.Screens.Play
///
protected virtual void StartGameplay()
{
- if (GameplayClockContainer.GameplayClock.IsRunning)
+ if (GameplayClockContainer.IsRunning)
throw new InvalidOperationException($"{nameof(StartGameplay)} should not be called when the gameplay clock is already running");
GameplayClockContainer.Reset(true);
diff --git a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
index 59b92a1b97..cc1254975c 100644
--- a/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
+++ b/osu.Game/Screens/Play/ScreenSuspensionHandler.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Screens.Play
public class ScreenSuspensionHandler : Component
{
private readonly GameplayClockContainer gameplayClockContainer;
- private Bindable isPaused;
+ private IBindable isPaused;
private readonly Bindable disableSuspensionBindable = new Bindable();
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index 3e2cf9a756..687705ff1b 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Screens.Play
private bool isClickable;
[Resolved]
- private GameplayClock gameplayClock { get; set; }
+ private IGameplayClock gameplayClock { get; set; }
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => true;
diff --git a/osu.Game/Skinning/SkinImporter.cs b/osu.Game/Skinning/SkinImporter.cs
index ed31a8c3f5..f270abd163 100644
--- a/osu.Game/Skinning/SkinImporter.cs
+++ b/osu.Game/Skinning/SkinImporter.cs
@@ -10,6 +10,7 @@ using System.Threading;
using Newtonsoft.Json;
using osu.Framework.Logging;
using osu.Framework.Platform;
+using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Extensions;
using osu.Game.IO;
@@ -49,7 +50,7 @@ namespace osu.Game.Skinning
protected override void Populate(SkinInfo model, ArchiveReader? archive, Realm realm, CancellationToken cancellationToken = default)
{
- var skinInfoFile = model.Files.SingleOrDefault(f => f.Filename == skin_info_file);
+ var skinInfoFile = model.GetFile(skin_info_file);
if (skinInfoFile != null)
{
@@ -129,7 +130,7 @@ namespace osu.Game.Skinning
authorLine,
};
- var existingFile = item.Files.SingleOrDefault(f => f.Filename.Equals(@"skin.ini", StringComparison.OrdinalIgnoreCase));
+ var existingFile = item.GetFile(@"skin.ini");
if (existingFile == null)
{
@@ -163,7 +164,7 @@ namespace osu.Game.Skinning
{
Logger.Log($"Skin {item}'s skin.ini had issues and has been removed. Please report this and provide the problematic skin.", LoggingTarget.Database, LogLevel.Important);
- var existingIni = item.Files.SingleOrDefault(f => f.Filename.Equals(@"skin.ini", StringComparison.OrdinalIgnoreCase));
+ var existingIni = item.GetFile(@"skin.ini");
if (existingIni != null)
item.Files.Remove(existingIni);
@@ -248,7 +249,7 @@ namespace osu.Game.Skinning
{
string filename = @$"{drawableInfo.Key}.json";
- var oldFile = s.Files.FirstOrDefault(f => f.Filename == filename);
+ var oldFile = s.GetFile(filename);
if (oldFile != null)
modelManager.ReplaceFile(oldFile, streamContent, s.Realm);
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index 8343f14050..6295604438 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Storyboards.Drawables
}
[BackgroundDependencyLoader(true)]
- private void load(GameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmAccess realm)
+ private void load(IGameplayClock clock, CancellationToken? cancellationToken, GameHost host, RealmAccess realm)
{
if (clock != null)
Clock = clock;
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
index 23b1004e74..ebd056ba50 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboardVideo.cs
@@ -1,10 +1,6 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
-using System;
-using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@@ -12,14 +8,14 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Textures;
using osu.Framework.Graphics.Video;
using osu.Game.Beatmaps;
-using osu.Game.Extensions;
namespace osu.Game.Storyboards.Drawables
{
public class DrawableStoryboardVideo : CompositeDrawable
{
public readonly StoryboardVideo Video;
- private Video video;
+
+ private Video? drawableVideo;
public override bool RemoveWhenNotAlive => false;
@@ -33,7 +29,7 @@ namespace osu.Game.Storyboards.Drawables
[BackgroundDependencyLoader(true)]
private void load(IBindable beatmap, TextureStore textureStore)
{
- string path = beatmap.Value.BeatmapSetInfo?.Files.FirstOrDefault(f => f.Filename.Equals(Video.Path, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath();
+ string? path = beatmap.Value.BeatmapSetInfo?.GetPathForFile(Video.Path);
if (path == null)
return;
@@ -43,7 +39,7 @@ namespace osu.Game.Storyboards.Drawables
if (stream == null)
return;
- InternalChild = video = new Video(stream, false)
+ InternalChild = drawableVideo = new Video(stream, false)
{
RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fill,
@@ -57,12 +53,12 @@ namespace osu.Game.Storyboards.Drawables
{
base.LoadComplete();
- if (video == null) return;
+ if (drawableVideo == null) return;
- using (video.BeginAbsoluteSequence(Video.StartTime))
+ using (drawableVideo.BeginAbsoluteSequence(Video.StartTime))
{
- Schedule(() => video.PlaybackPosition = Time.Current - Video.StartTime);
- video.FadeIn(500);
+ Schedule(() => drawableVideo.PlaybackPosition = Time.Current - Video.StartTime);
+ drawableVideo.FadeIn(500);
}
}
}
diff --git a/osu.Game/Storyboards/Storyboard.cs b/osu.Game/Storyboards/Storyboard.cs
index f30c3f7f94..473f1ce97f 100644
--- a/osu.Game/Storyboards/Storyboard.cs
+++ b/osu.Game/Storyboards/Storyboard.cs
@@ -1,14 +1,10 @@
// Copyright (c) ppy Pty Ltd . Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
-#nullable disable
-
-using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Graphics.Textures;
using osu.Game.Beatmaps;
-using osu.Game.Extensions;
using osu.Game.Rulesets.Mods;
using osu.Game.Storyboards.Drawables;
@@ -90,12 +86,12 @@ namespace osu.Game.Storyboards
}
}
- public DrawableStoryboard CreateDrawable(IReadOnlyList mods = null) =>
+ public DrawableStoryboard CreateDrawable(IReadOnlyList? mods = null) =>
new DrawableStoryboard(this, mods);
- public Texture GetTextureFromPath(string path, TextureStore textureStore)
+ public Texture? GetTextureFromPath(string path, TextureStore textureStore)
{
- string storyboardPath = BeatmapInfo.BeatmapSet?.Files.FirstOrDefault(f => f.Filename.Equals(path, StringComparison.OrdinalIgnoreCase))?.File.GetStoragePath();
+ string? storyboardPath = BeatmapInfo.BeatmapSet?.GetPathForFile(path);
if (!string.IsNullOrEmpty(storyboardPath))
return textureStore.Get(storyboardPath);
diff --git a/osu.Game/Tests/Visual/TestPlayer.cs b/osu.Game/Tests/Visual/TestPlayer.cs
index e2ddd1734d..93a155e083 100644
--- a/osu.Game/Tests/Visual/TestPlayer.cs
+++ b/osu.Game/Tests/Visual/TestPlayer.cs
@@ -10,6 +10,7 @@ using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Game.Online.API;
using osu.Game.Online.Rooms;
+using osu.Game.Online.Spectator;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
@@ -46,6 +47,9 @@ namespace osu.Game.Tests.Visual
public readonly List Results = new List();
+ [Resolved]
+ private SpectatorClient spectatorClient { get; set; }
+
public TestPlayer(bool allowPause = true, bool showResults = true, bool pauseOnFocusLost = false)
: base(new PlayerConfiguration
{
@@ -98,5 +102,15 @@ namespace osu.Game.Tests.Visual
ScoreProcessor.NewJudgement += r => Results.Add(r);
}
+
+ protected override void Dispose(bool isDisposing)
+ {
+ base.Dispose(isDisposing);
+
+ // Specific to tests, the player can be disposed without OnExiting() ever being called.
+ // We should make sure that the gameplay session has finished even in this case.
+ if (LoadedBeatmapSuccessfully)
+ spectatorClient?.EndPlaying(GameplayState);
+ }
}
}
diff --git a/osu.Game/Tests/VisualTestRunner.cs b/osu.Game/Tests/VisualTestRunner.cs
index bd98482768..c8279b9e3c 100644
--- a/osu.Game/Tests/VisualTestRunner.cs
+++ b/osu.Game/Tests/VisualTestRunner.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Tests
[STAThread]
public static int Main(string[] args)
{
- using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu", new HostOptions { BindIPC = true, }))
+ using (DesktopGameHost host = Host.GetSuitableDesktopHost(@"osu-development", new HostOptions { BindIPC = true, }))
{
host.Run(new OsuTestBrowser());
return 0;
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index b371aa3618..c17d45e84a 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -36,8 +36,8 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
diff --git a/osu.iOS.props b/osu.iOS.props
index bab652bbee..5bfb53bc9d 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -61,8 +61,8 @@
-
-
+
+
@@ -84,7 +84,7 @@
-
+