mirror of
https://github.com/ppy/osu
synced 2024-12-25 16:22:23 +00:00
6f1664f0a6
I've been meaning to make the progress bar synchronise with the beat rather than a continuous countdown, just to give the overlay a bit more of a rhythmic feel. Not completely happy with how this feels but I think it's a start? I had to refactor how the break overlay works in the process. It no longer creates transforms for all breaks ahead-of-time, which could be argued as a better way of doing things. It's more dynamically able to handle breaks now (maybe useful for the future, who knows).
90 lines
2.6 KiB
C#
90 lines
2.6 KiB
C#
// 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.Diagnostics.CodeAnalysis;
|
|
using System.Linq;
|
|
|
|
namespace osu.Game.Utils
|
|
{
|
|
/// <summary>
|
|
/// Represents a tracking component used for whether a specific time instant falls into any of the provided periods.
|
|
/// </summary>
|
|
public class PeriodTracker
|
|
{
|
|
private readonly List<Period> periods;
|
|
private int nearestIndex;
|
|
|
|
public PeriodTracker(IEnumerable<Period> periods)
|
|
{
|
|
this.periods = periods.OrderBy(period => period.Start).ToList();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Whether the provided time is in any of the added periods.
|
|
/// </summary>
|
|
/// <param name="time">The time value to check.</param>
|
|
public bool IsInAny(double time) => IsInAny(time, out _);
|
|
|
|
/// <summary>
|
|
/// Whether the provided time is in any of the added periods.
|
|
/// </summary>
|
|
/// <param name="time">The time value to check.</param>
|
|
/// <param name="period">The period which matched.</param>
|
|
public bool IsInAny(double time, [NotNullWhen(true)] out Period? period)
|
|
{
|
|
period = null;
|
|
|
|
if (periods.Count == 0)
|
|
return false;
|
|
|
|
if (time > periods[nearestIndex].End)
|
|
{
|
|
while (time > periods[nearestIndex].End && nearestIndex < periods.Count - 1)
|
|
nearestIndex++;
|
|
}
|
|
else
|
|
{
|
|
while (time < periods[nearestIndex].Start && nearestIndex > 0)
|
|
nearestIndex--;
|
|
}
|
|
|
|
var nearest = periods[nearestIndex];
|
|
bool isInAny = time >= nearest.Start && time <= nearest.End;
|
|
|
|
if (isInAny)
|
|
{
|
|
period = nearest;
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public readonly struct Period
|
|
{
|
|
/// <summary>
|
|
/// The start time of this period.
|
|
/// </summary>
|
|
public readonly double Start;
|
|
|
|
/// <summary>
|
|
/// The end time of this period.
|
|
/// </summary>
|
|
public readonly double End;
|
|
|
|
public double Duration => End - Start;
|
|
|
|
public Period(double start, double end)
|
|
{
|
|
if (start >= end)
|
|
throw new ArgumentException($"Invalid period provided, {nameof(start)} must be less than {nameof(end)}");
|
|
|
|
Start = start;
|
|
End = end;
|
|
}
|
|
}
|
|
}
|