sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 07:33:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move IBeatmap arg into context

Browse Source
This commit is contained in:
Naxess
2021-05-13 11:24:22 +02:00
parent b37cb3bdbe
commit 19800f5f7f
18 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Rulesets/Edit/BeatmapVerifier.cs
View File

@ -3,7 +3,6 @@
using System.Collections.Generic;
using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks;
using osu.Game.Rulesets.Edit.Checks.Components;
@ -29,9 +28,9 @@ namespace osu.Game.Rulesets.Edit
new CheckConcurrentObjects()
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
return checks.SelectMany(check => check.Run(beatmap, context));
return checks.SelectMany(check => check.Run(context));
}
}
}

8
osu.Game/Rulesets/Edit/BeatmapVerifierContext.cs
View File

@ -11,6 +11,11 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
public class BeatmapVerifierContext
{
/// <summary>
/// The playable beatmap instance of the current beatmap.
/// </summary>
public readonly IBeatmap Beatmap;
/// <summary>
/// The working beatmap instance of the current beatmap.
/// </summary>
@ -21,8 +26,9 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
public DifficultyRating InterpretedDifficulty;
public BeatmapVerifierContext(IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
public BeatmapVerifierContext(IBeatmap beatmap, IWorkingBeatmap workingBeatmap, DifficultyRating difficultyRating = DifficultyRating.ExpertPlus)
{
Beatmap = beatmap;
WorkingBeatmap = workingBeatmap;
InterpretedDifficulty = difficultyRating;
}

5
osu.Game/Rulesets/Edit/Checks/CheckAudioQuality.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
namespace osu.Game.Rulesets.Edit.Checks
@ -26,9 +25,9 @@ namespace osu.Game.Rulesets.Edit.Checks
new IssueTemplateNoBitrate(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
var audioFile = beatmap.Metadata?.AudioFile;
var audioFile = context.Beatmap.Metadata?.AudioFile;
if (audioFile == null)
yield break;

7
osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
namespace osu.Game.Rulesets.Edit.Checks
@ -30,9 +29,9 @@ namespace osu.Game.Rulesets.Edit.Checks
new IssueTemplateTooUncompressed(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
var backgroundFile = beatmap.Metadata?.BackgroundFile;
var backgroundFile = context.Beatmap.Metadata?.BackgroundFile;
if (backgroundFile == null)
yield break;
@ -48,7 +47,7 @@ namespace osu.Game.Rulesets.Edit.Checks
else if (texture.Width < low_width || texture.Height < low_height)
yield return new IssueTemplateLowResolution(this).Create(texture.Width, texture.Height);
string storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
string storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(backgroundFile);
double filesizeMb = context.WorkingBeatmap.GetStream(storagePath).Length / (1024d * 1024d);
if (filesizeMb > max_filesize_mb)

11
osu.Game/Rulesets/Edit/Checks/CheckConcurrentObjects.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
@ -22,15 +21,15 @@ namespace osu.Game.Rulesets.Edit.Checks
new IssueTemplateConcurrentDifferent(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
for (int i = 0; i < beatmap.HitObjects.Count - 1; ++i)
for (int i = 0; i < context.Beatmap.HitObjects.Count - 1; ++i)
{
var hitobject = beatmap.HitObjects[i];
var hitobject = context.Beatmap.HitObjects[i];
for (int j = i + 1; j < beatmap.HitObjects.Count; ++j)
for (int j = i + 1; j < context.Beatmap.HitObjects.Count; ++j)
{
var nextHitobject = beatmap.HitObjects[j];
var nextHitobject = context.Beatmap.HitObjects[j];
// Accounts for rulesets with hitobjects separated by columns, such as Mania.
// In these cases we only care about concurrent objects within the same column.

6
osu.Game/Rulesets/Edit/Checks/CheckFilePresence.cs
View File

@ -21,9 +21,9 @@ namespace osu.Game.Rulesets.Edit.Checks
new IssueTemplateDoesNotExist(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
var filename = GetFilename(beatmap);
var filename = GetFilename(context.Beatmap);
if (filename == null)
{
@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Edit.Checks
}
// If the file is set, also make sure it still exists.
var storagePath = beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
var storagePath = context.Beatmap.BeatmapInfo.BeatmapSet.GetPathForFile(filename);
if (storagePath != null)
yield break;

7
osu.Game/Rulesets/Edit/Checks/CheckUnsnappedObjects.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
using osu.Game.Rulesets.Objects;
using osu.Game.Rulesets.Objects.Types;
@ -22,11 +21,11 @@ namespace osu.Game.Rulesets.Edit.Checks
new IssueTemplateSmallUnsnap(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context)
public IEnumerable<Issue> Run(BeatmapVerifierContext context)
{
var controlPointInfo = beatmap.ControlPointInfo;
var controlPointInfo = context.Beatmap.ControlPointInfo;
foreach (var hitobject in beatmap.HitObjects)
foreach (var hitobject in context.Beatmap.HitObjects)
{
double startUnsnap = hitobject.StartTime - controlPointInfo.GetClosestSnappedTime(hitobject.StartTime);
string startPostfix = hitobject is IHasDuration ? "start" : "";

4
osu.Game/Rulesets/Edit/Checks/Components/ICheck.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Beatmaps;
namespace osu.Game.Rulesets.Edit.Checks.Components
{
@ -24,8 +23,7 @@ namespace osu.Game.Rulesets.Edit.Checks.Components
/// <summary>
/// Runs this check and returns any issues detected for the provided beatmap.
/// </summary>
/// <param name="beatmap">The playable beatmap of the beatmap to run the check on.</param>
/// <param name="context">The beatmap verifier context associated with the beatmap.</param>
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
public IEnumerable<Issue> Run(BeatmapVerifierContext context);
}
}

3
osu.Game/Rulesets/Edit/IBeatmapVerifier.cs
View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Edit.Checks.Components;
namespace osu.Game.Rulesets.Edit
@ -12,6 +11,6 @@ namespace osu.Game.Rulesets.Edit
/// </summary>
public interface IBeatmapVerifier
{
public IEnumerable<Issue> Run(IBeatmap beatmap, BeatmapVerifierContext context);
public IEnumerable<Issue> Run(BeatmapVerifierContext context);
}
}