sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into beatmap-verifier-context

Browse Source
This commit is contained in:
Naxess
2021-05-13 07:40:33 +02:00
committed by GitHub
parent b7bc42e0d3 5b71d8ca37
commit e7c7786db3
65 changed files with 2444 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Screens/Edit/Verify/IssueList.cs
View File

@ -18,6 +18,7 @@ using osuTK;
namespace osu.Game.Screens.Edit.Verify
{
[Cached]
public class IssueList : CompositeDrawable
{
private IssueTable table;
@ -32,11 +33,7 @@ namespace osu.Game.Screens.Edit.Verify
private EditorBeatmap beatmap { get; set; }
[Resolved]
private Bindable<Issue> selectedIssue { get; set; }
public Dictionary<IssueType, Bindable<bool>> ShowType { get; set; }
public Bindable<DifficultyRating> InterpretedDifficulty { get; set; }
private VerifyScreen verify { get; set; }
private IBeatmapVerifier rulesetVerifier;
private BeatmapVerifier generalVerifier;
@ -45,21 +42,11 @@ namespace osu.Game.Screens.Edit.Verify
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colours)
{
// Reflects the user interface. Only types in this dictionary have configurable visibility.
ShowType = new Dictionary<IssueType, Bindable<bool>>
{
{ IssueType.Warning, new Bindable<bool>(true) },
{ IssueType.Error, new Bindable<bool>(true) },
{ IssueType.Negligible, new Bindable<bool>(false) }
};
generalVerifier = new BeatmapVerifier();
rulesetVerifier = beatmap.BeatmapInfo.Ruleset?.CreateInstance()?.CreateBeatmapVerifier();
InterpretedDifficulty = new Bindable<DifficultyRating>(beatmap.BeatmapInfo.DifficultyRating);
context = new BeatmapVerifierContext(workingBeatmap.Value);
context.InterpretedDifficulty.BindTo(InterpretedDifficulty);
context.InterpretedDifficulty.BindTo(verify.InterpretedDifficulty.GetBoundCopy());
RelativeSizeAxes = Axes.Both;
@ -86,7 +73,7 @@ namespace osu.Game.Screens.Edit.Verify
new TriangleButton
{
Text = "Refresh",
Action = Refresh,
Action = refresh,
Size = new Vector2(120, 40),
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
@ -100,10 +87,13 @@ namespace osu.Game.Screens.Edit.Verify
{
base.LoadComplete();
Refresh();
verify.InterpretedDifficulty.BindValueChanged(_ => refresh());
verify.HiddenIssueTypes.BindCollectionChanged((_, __) => refresh());
refresh();
}
public void Refresh()
private void refresh()
{
var issues = generalVerifier.Run(beatmap, context);
@ -119,13 +109,7 @@ namespace osu.Game.Screens.Edit.Verify
private IEnumerable<Issue> filter(IEnumerable<Issue> issues)
{
foreach (IssueType issueType in ShowType.Keys)
{
if (!ShowType[issueType].Value)
issues = issues.Where(issue => issue.Template.Type != issueType);
}
return issues;
return issues.Where(issue => !verify.HiddenIssueTypes.Contains(issue.Template.Type));
}
}
}