mirror of
https://github.com/ppy/osu.git
synced 2026-05-15 21:03:13 +08:00
18d4ba5874
Most of this is as everywhere else, but there's also interesting code inspection fixes from the InspectCode bump, so I'll talk about that a little. ## [Fix suspicious equality in `Hotkey`](https://github.com/ppy/osu/commit/948136e49e88a721827d54e51c5759fe9aca811d) Inspection: https://www.jetbrains.com/help/resharper/TypeWithSuspiciousEqualityIsUsedInRecord.Global.html Pretty annoying to fix, nullable array types are a pain. Does look legit though. ## [Fix `StarDifficulty` using inefficient struct equality](https://github.com/ppy/osu/commit/2db775ebb0bb9f18de67677ef84b993465d26545) Inspection: https://www.jetbrains.com/help/resharper/DefaultStructEqualityIsUsed.Global.html This is a dodgy one because there's no real sane way to define equality on `StarDifficulty` now that it has difficulty and performance attributes jammed into it. So I just basically shut the inspection up with a `record` modifier and move on. Unclear where the equality is used precisely. It's from a global inspection. F12 is very unhelpful when trying to track down usages of `Equals()`. We definitely have `Bindable<StarDifficulty>` instances and those do use equality. Maybe more than that. ## [Use `nameof` expressions to reference enum member names](https://github.com/ppy/osu/commit/aa08175c803bc725f3b15a92174dfe6d1b812d91) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Pretty quaint. ## [Prefer using concrete values over `default` or `new()`](https://github.com/ppy/osu/commit/b21ee08d7748be10d42268d5c2eb77369026545d) Inspection: https://www.jetbrains.com/help/resharper/PreferConcreteValueOverDefault.html I could see this one going both ways, but I'm kinda sold on this inspection. Explicit is always better. Saves some allocations in the `CancellationToken` cases as well. ## [Explicitly call `.AsEnumerable()` in some realm usages](https://github.com/ppy/osu/commit/c8ce1ecd42b9d8abb8b9e2ab93d471f463e80401) Inspection: https://www.jetbrains.com/help/resharper/PossibleUnintendedQueryableAsEnumerable.html Not fully sold on this one but it's quick and simple so might as well. ## [Simplify dictionary removal with single `.Remove()` call](https://github.com/ppy/osu/commit/5964ceccea900302df726b7a8ecbf6b74eb2e427) Inspection: https://www.jetbrains.com/help/resharper/CanSimplifyDictionaryRemovingWithSingleCall.html Not much to say.
80 lines
3.3 KiB
C#
80 lines
3.3 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.
|
|
|
|
#nullable disable
|
|
|
|
using System.Collections.Generic;
|
|
using osu.Game.Rulesets.Objects;
|
|
|
|
namespace osu.Game.Rulesets.Difficulty.Preprocessing
|
|
{
|
|
/// <summary>
|
|
/// Wraps a <see cref="HitObject"/> and provides additional information to be used for difficulty calculation.
|
|
/// </summary>
|
|
public class DifficultyHitObject
|
|
{
|
|
private readonly IReadOnlyList<DifficultyHitObject> difficultyHitObjects;
|
|
|
|
/// <summary>
|
|
/// The index of this <see cref="DifficultyHitObject"/> in the list of all <see cref="DifficultyHitObject"/>s.
|
|
/// </summary>
|
|
public int Index;
|
|
|
|
/// <summary>
|
|
/// The <see cref="HitObject"/> this <see cref="DifficultyHitObject"/> wraps.
|
|
/// </summary>
|
|
public readonly HitObject BaseObject;
|
|
|
|
/// <summary>
|
|
/// The last <see cref="HitObject"/> which occurs before <see cref="BaseObject"/>.
|
|
/// </summary>
|
|
public readonly HitObject LastObject;
|
|
|
|
/// <summary>
|
|
/// Amount of time elapsed between <see cref="BaseObject"/> and <see cref="LastObject"/>, adjusted by clockrate.
|
|
/// </summary>
|
|
public readonly double DeltaTime;
|
|
|
|
/// <summary>
|
|
/// Clockrate adjusted start time of <see cref="BaseObject"/>.
|
|
/// </summary>
|
|
public readonly double StartTime;
|
|
|
|
/// <summary>
|
|
/// Clockrate adjusted end time of <see cref="BaseObject"/>.
|
|
/// </summary>
|
|
public readonly double EndTime;
|
|
|
|
/// <summary>
|
|
/// Creates a new <see cref="DifficultyHitObject"/>.
|
|
/// </summary>
|
|
/// <param name="hitObject">The <see cref="HitObject"/> which this <see cref="DifficultyHitObject"/> wraps.</param>
|
|
/// <param name="lastObject">The last <see cref="HitObject"/> which occurs before <paramref name="hitObject"/> in the beatmap.</param>
|
|
/// <param name="clockRate">The rate at which the gameplay clock is run at.</param>
|
|
/// <param name="objects">The list of <see cref="DifficultyHitObject"/>s in the current beatmap.</param>
|
|
/// <param name="index">The index of this <see cref="DifficultyHitObject"/> in <paramref name="objects"/> list.</param>
|
|
public DifficultyHitObject(HitObject hitObject, HitObject lastObject, double clockRate, List<DifficultyHitObject> objects, int index)
|
|
{
|
|
difficultyHitObjects = objects;
|
|
Index = index;
|
|
BaseObject = hitObject;
|
|
LastObject = lastObject;
|
|
DeltaTime = (hitObject.StartTime - lastObject.StartTime) / clockRate;
|
|
StartTime = hitObject.StartTime / clockRate;
|
|
EndTime = hitObject.GetEndTime() / clockRate;
|
|
}
|
|
|
|
public DifficultyHitObject Previous(int backwardsIndex)
|
|
{
|
|
int index = Index - (backwardsIndex + 1);
|
|
return index >= 0 && index < difficultyHitObjects.Count ? difficultyHitObjects[index] : null;
|
|
}
|
|
|
|
public DifficultyHitObject Next(int forwardsIndex)
|
|
{
|
|
int index = Index + (forwardsIndex + 1);
|
|
return index >= 0 && index < difficultyHitObjects.Count ? difficultyHitObjects[index] : null;
|
|
}
|
|
}
|
|
}
|