h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-03 14:24:18 +08:00
Code Issues Releases Wiki Activity

move methods to TimingCheckUtils

Browse Source 
so they can be reused for future timing-related checks
This commit is contained in:
Hivie
2025-08-01 18:37:54 +01:00
Unverified
parent 3a44e1d5be
commit 0fcef7b0ee
2 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Rulesets/Edit/Checks/CheckInconsistentTimingControlPoints.cs
+5 -21
View File
@@ -3,18 +3,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Utils;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Rulesets.Edit.Checks.Components;
namespace osu.Game.Rulesets.Edit.Checks
{
public class CheckInconsistentTimingControlPoints : ICheck
{
// Small tolerance for floating point comparison
private const double timing_tolerance = 0.01;
public CheckMetadata Metadata => new CheckMetadata(CheckCategory.Timing, "Inconsistent timing control points");
public IEnumerable<IssueTemplate> PossibleTemplates => new IssueTemplate[]
@@ -47,8 +41,8 @@ namespace osu.Game.Rulesets.Edit.Checks
// Check each timing point in the reference against this difficulty
foreach (var referencePoint in referenceTimingPoints)
{
var matchingPoint = findMatchingTimingPoint(timingPoints, referencePoint.Time);
var exactMatchingPoint = findExactMatchingTimingPoint(timingPoints, referencePoint.Time);
var matchingPoint = TimingCheckUtils.FindMatchingTimingPoint(timingPoints, referencePoint.Time);
var exactMatchingPoint = TimingCheckUtils.FindExactMatchingTimingPoint(timingPoints, referencePoint.Time);
if (matchingPoint == null)
{
@@ -63,7 +57,7 @@ namespace osu.Game.Rulesets.Edit.Checks
}
// Check for BPM inconsistency
if (Math.Abs(referencePoint.BeatLength - matchingPoint.BeatLength) > timing_tolerance)
if (Math.Abs(referencePoint.BeatLength - matchingPoint.BeatLength) > TimingCheckUtils.TIMING_TOLERANCE)
{
yield return new IssueTemplateInconsistentBPM(this).Create(referencePoint.Time, beatmap.BeatmapInfo.DifficultyName);
}
@@ -79,8 +73,8 @@ namespace osu.Game.Rulesets.Edit.Checks
// Check timing points in this difficulty that aren't in the reference
foreach (var timingPoint in timingPoints)
{
var matchingReferencePoint = findMatchingTimingPoint(referenceTimingPoints, timingPoint.Time);
var exactMatchingReferencePoint = findExactMatchingTimingPoint(referenceTimingPoints, timingPoint.Time);
var matchingReferencePoint = TimingCheckUtils.FindMatchingTimingPoint(referenceTimingPoints, timingPoint.Time);
var exactMatchingReferencePoint = TimingCheckUtils.FindExactMatchingTimingPoint(referenceTimingPoints, timingPoint.Time);
if (matchingReferencePoint == null)
{
@@ -94,16 +88,6 @@ namespace osu.Game.Rulesets.Edit.Checks
}
}
private static TimingControlPoint? findMatchingTimingPoint(IEnumerable<TimingControlPoint> timingPoints, double time)
{
return timingPoints.FirstOrDefault(tp => Precision.AlmostEquals(tp.Time, Math.Round(time), 1.0));
}
private static TimingControlPoint? findExactMatchingTimingPoint(IEnumerable<TimingControlPoint> timingPoints, double time)
{
return timingPoints.FirstOrDefault(tp => Precision.AlmostEquals(tp.Time, time, timing_tolerance));
}
public class IssueTemplateMissingTimingPoint : IssueTemplate
{
public IssueTemplateMissingTimingPoint(ICheck check)
osu.Game/Rulesets/Edit/Checks/Components/TimingCheckUtils.cs
+39
View File
@@ -0,0 +1,39 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Utils;
using osu.Game.Beatmaps.ControlPoints;
namespace osu.Game.Rulesets.Edit.Checks.Components
{
public static class TimingCheckUtils
{
// Small tolerance for floating point comparison
public const double TIMING_TOLERANCE = 0.01;
/// <summary>
/// Finds a timing control point that starts at approximately the same time (within 1ms after rounding).
/// </summary>
/// <param name="timingPoints">The collection of timing points to search.</param>
/// <param name="time">The time to match against.</param>
/// <returns>The matching timing control point, or null if none found.</returns>
public static TimingControlPoint? FindMatchingTimingPoint(IEnumerable<TimingControlPoint> timingPoints, double time)
{
return timingPoints.FirstOrDefault(tp => Precision.AlmostEquals(tp.Time, Math.Round(time), 1.0));
}
/// <summary>
/// Finds a timing control point that starts at precisely the same time (within timing tolerance).
/// </summary>
/// <param name="timingPoints">The collection of timing points to search.</param>
/// <param name="time">The time to match against.</param>
/// <returns>The exact matching timing control point, or null if none found.</returns>
public static TimingControlPoint? FindExactMatchingTimingPoint(IEnumerable<TimingControlPoint> timingPoints, double time)
{
return timingPoints.FirstOrDefault(tp => Precision.AlmostEquals(tp.Time, time, TIMING_TOLERANCE));
}
}
}