sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Remove check ctors and locals

Browse Source
This commit is contained in:
Naxess 2021-04-12 17:12:37 +02:00
parent 62c1812282
commit bb720c23a0
2 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game.Rulesets.Osu/Edit/Checks/CheckOffscreenObjects.cs
View File

@ -22,22 +22,13 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
// (higher = more performant, but higher false-negative chance). // (higher = more performant, but higher false-negative chance).
private const int path_step_size = 5; private const int path_step_size = 5;
private readonly IssueTemplateOffscreenCircle templateOffscreenCircle;
private readonly IssueTemplateOffscreenSlider templateOffscreenSlider;
private readonly IssueTemplate[] templates;
public CheckOffscreenObjects()
{
templates = new IssueTemplate[]
{
templateOffscreenCircle = new IssueTemplateOffscreenCircle(this),
templateOffscreenSlider = new IssueTemplateOffscreenSlider(this)
};
}
public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects"); public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Compose, "Offscreen hitobjects");
public IEnumerable<IssueTemplate> PossibleTemplates => templates; public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
{
new IssueTemplateOffscreenCircle(this),
new IssueTemplateOffscreenSlider(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap) public IEnumerable<Issue> Run(IBeatmap beatmap)
{ {
@ -56,7 +47,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
case HitCircle circle: case HitCircle circle:
{ {
if (isOffscreen(circle.StackedPosition, circle.Radius)) if (isOffscreen(circle.StackedPosition, circle.Radius))
yield return templateOffscreenCircle.Create(circle); yield return new IssueTemplateOffscreenCircle(this).Create(circle);
break; break;
} }
@ -82,7 +73,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
// `SpanDuration` ensures we don't include reverses. // `SpanDuration` ensures we don't include reverses.
double time = slider.StartTime + progress * slider.SpanDuration; double time = slider.StartTime + progress * slider.SpanDuration;
yield return templateOffscreenSlider.Create(slider, time); yield return new IssueTemplateOffscreenSlider(this).Create(slider, time);
yield break; yield break;
} }
@ -91,7 +82,7 @@ namespace osu.Game.Rulesets.Osu.Edit.Checks
if (!isOffscreen(slider.StackedEndPosition, slider.Radius)) if (!isOffscreen(slider.StackedEndPosition, slider.Radius))
yield break; yield break;
yield return templateOffscreenSlider.Create(slider, slider.EndTime); yield return new IssueTemplateOffscreenSlider(this).Create(slider, slider.EndTime);
} }
private bool isOffscreen(Vector2 position, double radius) private bool isOffscreen(Vector2 position, double radius)

23
osu.Game/Rulesets/Edit/Checks/CheckBackground.cs
View File

@ -10,28 +10,19 @@ namespace osu.Game.Rulesets.Edit.Checks
{ {
public class CheckBackground : ICheck public class CheckBackground : ICheck
{ {
private readonly IssueTemplateNoneSet templateNoneSet;
private readonly IssueTemplateDoesNotExist templateDoesNotExist;
private readonly IssueTemplate[] templates;
public CheckBackground()
{
templates = new IssueTemplate[]
{
templateNoneSet = new IssueTemplateNoneSet(this),
templateDoesNotExist = new IssueTemplateDoesNotExist(this)
};
}
public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background"); public CheckMetadata Metadata { get; } = new CheckMetadata(CheckCategory.Resources, "Missing background");
public IEnumerable<IssueTemplate> PossibleTemplates => templates; public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
{
new IssueTemplateNoneSet(this),
new IssueTemplateDoesNotExist(this)
};
public IEnumerable<Issue> Run(IBeatmap beatmap) public IEnumerable<Issue> Run(IBeatmap beatmap)
{ {
if (beatmap.Metadata.BackgroundFile == null) if (beatmap.Metadata.BackgroundFile == null)
{ {
yield return templateNoneSet.Create(); yield return new IssueTemplateNoneSet(this).Create();
yield break; yield break;
} }
@ -44,7 +35,7 @@ namespace osu.Game.Rulesets.Edit.Checks
if (file != null) if (file != null)
yield break; yield break;
yield return templateDoesNotExist.Create(beatmap.Metadata.BackgroundFile); yield return new IssueTemplateDoesNotExist(this).Create(beatmap.Metadata.BackgroundFile);
} }
private class IssueTemplateNoneSet : IssueTemplate private class IssueTemplateNoneSet : IssueTemplate