RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-02 04:12:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't display calibration options when the previous play was too short to be useful

Browse Source
This commit is contained in:
Dean Herbert 2022-03-01 19:31:11 +09:00
parent bc2a15db96
commit 4d9efe771b
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/Gameplay/TestSceneBeatmapOffsetControl.cs
View File

@ -33,6 +33,20 @@ namespace osu.Game.Tests.Visual.Gameplay
});
}
[Test]
public void TestTooShortToDisplay()
{
AddStep("Set short reference score", () =>
{
offsetControl.ReferenceScore.Value = new ScoreInfo
{
HitEvents = TestSceneHitEventTimingDistributionGraph.CreateDistributedHitEvents(0, 2)
};
});
AddAssert("No calibration button", () => !offsetControl.ChildrenOfType<SettingsButton>().Any());
}
[Test]
public void TestDisplay()
{

46
osu.Game/Screens/Play/PlayerSettings/BeatmapOffsetControl.cs
View File

@ -11,6 +11,8 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.Scoring;
@ -75,6 +77,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
[Resolved]
private IBindable<WorkingBeatmap> beatmap { get; set; }
[Resolved]
private OsuColour colours { get; set; }
private IDisposable beatmapOffsetSubscription;
protected override void LoadComplete()
@ -140,32 +145,53 @@ namespace osu.Game.Screens.Play.PlayerSettings
private void scoreChanged(ValueChangedEvent<ScoreInfo> score)
{
if (!(score.NewValue?.HitEvents.CalculateAverageHitError() is double average))
{
referenceScoreContainer.Clear();
return;
}
var hitEvents = score.NewValue?.HitEvents;
lastPlayAverage = average;
referenceScoreContainer.Clear();
if (!(hitEvents?.CalculateAverageHitError() is double average))
return;
referenceScoreContainer.Children = new Drawable[]
{
new OsuSpriteText
{
Text = "Last play:"
Text = "Previous play:"
},
new HitEventTimingDistributionGraph(score.NewValue.HitEvents)
};
if (hitEvents.Count < 10)
{
referenceScoreContainer.AddRange(new Drawable[]
{
new OsuTextFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Colour = colours.Red1,
Text = "Previous play too short to use for calibration"
},
});
return;
}
lastPlayAverage = average;
referenceScoreContainer.AddRange(new Drawable[]
{
new HitEventTimingDistributionGraph(hitEvents)
{
RelativeSizeAxes = Axes.X,
Height = 50,
},
new AverageHitError(score.NewValue.HitEvents),
new AverageHitError(hitEvents),
useAverageButton = new SettingsButton
{
Text = "Calibrate using last play",
Action = () => Current.Value = lastPlayAverage
},
};
});
}
protected override void Dispose(bool isDisposing)