h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 15:17:27 +08:00
Code Issues Releases Wiki Activity

Use empty HitWindows to fix editor slider display (#6445)

Browse Source 
Use empty HitWindows to fix editor slider display

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
This commit is contained in:
Dean Herbert 2019-10-10 17:10:34 +09:00 committed by GitHub
commit c6a6ea3890
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 67 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/Objects/CatchHitObject.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Catch.Objects
Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5; Scale = 1.0f - 0.7f * (difficulty.CircleSize - 5) / 5;
} }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
public enum FruitVisualRepresentation public enum FruitVisualRepresentation

2
osu.Game.Rulesets.Mania/Objects/HoldNote.cs
View File

@ -101,6 +101,6 @@ namespace osu.Game.Rulesets.Mania.Objects
public override Judgement CreateJudgement() => new HoldNoteJudgement(); public override Judgement CreateJudgement() => new HoldNoteJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Mania/Objects/HoldNoteTick.cs
View File

@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Mania.Objects
{ {
public override Judgement CreateJudgement() => new HoldNoteTickJudgement(); public override Judgement CreateJudgement() => new HoldNoteTickJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Osu/Objects/RepeatPoint.cs
View File

@ -30,6 +30,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public override Judgement CreateJudgement() => new OsuJudgement(); public override Judgement CreateJudgement() => new OsuJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Osu/Objects/Slider.cs
View File

@ -205,6 +205,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public override Judgement CreateJudgement() => new OsuJudgement(); public override Judgement CreateJudgement() => new OsuJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Osu/Objects/SliderTailCircle.cs
View File

@ -25,6 +25,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public override Judgement CreateJudgement() => new OsuSliderTailJudgement(); public override Judgement CreateJudgement() => new OsuSliderTailJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Osu/Objects/SliderTick.cs
View File

@ -32,6 +32,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public override Judgement CreateJudgement() => new OsuJudgement(); public override Judgement CreateJudgement() => new OsuJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Osu/Objects/Spinner.cs
View File

@ -33,6 +33,6 @@ namespace osu.Game.Rulesets.Osu.Objects
public override Judgement CreateJudgement() => new OsuJudgement(); public override Judgement CreateJudgement() => new OsuJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs
View File

@ -88,6 +88,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
public override Judgement CreateJudgement() => new TaikoDrumRollJudgement(); public override Judgement CreateJudgement() => new TaikoDrumRollJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/DrumRollTick.cs
View File

@ -27,6 +27,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement(); public override Judgement CreateJudgement() => new TaikoDrumRollTickJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/StrongHitObject.cs
View File

@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
{ {
public override Judgement CreateJudgement() => new TaikoStrongJudgement(); public override Judgement CreateJudgement() => new TaikoStrongJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/Swell.cs
View File

@ -35,6 +35,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
public override Judgement CreateJudgement() => new TaikoSwellJudgement(); public override Judgement CreateJudgement() => new TaikoSwellJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game.Rulesets.Taiko/Objects/SwellTick.cs
View File

@ -11,6 +11,6 @@ namespace osu.Game.Rulesets.Taiko.Objects
{ {
public override Judgement CreateJudgement() => new TaikoSwellTickJudgement(); public override Judgement CreateJudgement() => new TaikoSwellTickJudgement();
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

5
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -173,7 +173,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
{ {
UpdateInitialTransforms(); UpdateInitialTransforms();
var judgementOffset = Math.Min(HitObject.HitWindows?.WindowFor(HitResult.Miss) ?? double.MaxValue, Result?.TimeOffset ?? 0); var judgementOffset = Result?.TimeOffset ?? 0;
using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true)) using (BeginDelayedSequence(InitialLifetimeOffset + judgementOffset, true))
{ {
@ -379,7 +379,8 @@ namespace osu.Game.Rulesets.Objects.Drawables
// Ensure that the judgement is given a valid time offset, because this may not get set by the caller // Ensure that the judgement is given a valid time offset, because this may not get set by the caller
var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime; var endTime = (HitObject as IHasEndTime)?.EndTime ?? HitObject.StartTime;
Result.TimeOffset = Time.Current - endTime;
Result.TimeOffset = Math.Min(HitObject.HitWindows.WindowFor(HitResult.Miss), Time.Current - endTime);
switch (Result.Type) switch (Result.Type)
{ {

6
osu.Game/Rulesets/Objects/HitObject.cs
View File

@ -66,7 +66,6 @@ namespace osu.Game.Rulesets.Objects
/// <summary> /// <summary>
/// The hit windows for this <see cref="HitObject"/>. /// The hit windows for this <see cref="HitObject"/>.
/// </summary> /// </summary>
[CanBeNull]
public HitWindows HitWindows { get; set; } public HitWindows HitWindows { get; set; }
private readonly List<HitObject> nestedHitObjects = new List<HitObject>(); private readonly List<HitObject> nestedHitObjects = new List<HitObject>();
@ -113,11 +112,8 @@ namespace osu.Game.Rulesets.Objects
nestedHitObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime)); nestedHitObjects.Sort((h1, h2) => h1.StartTime.CompareTo(h2.StartTime));
foreach (var h in nestedHitObjects) foreach (var h in nestedHitObjects)
{
h.HitWindows = HitWindows;
h.ApplyDefaults(controlPointInfo, difficulty); h.ApplyDefaults(controlPointInfo, difficulty);
} }
}
protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty) protected virtual void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{ {
@ -147,7 +143,7 @@ namespace osu.Game.Rulesets.Objects
/// This will only be invoked if <see cref="HitWindows"/> hasn't been set externally (e.g. from a <see cref="BeatmapConverter{T}"/>. /// This will only be invoked if <see cref="HitWindows"/> hasn't been set externally (e.g. from a <see cref="BeatmapConverter{T}"/>.
/// </para> /// </para>
/// </summary> /// </summary>
[CanBeNull] [NotNull]
protected virtual HitWindows CreateHitWindows() => new HitWindows(); protected virtual HitWindows CreateHitWindows() => new HitWindows();
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHit.cs
View File

@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
{ {
public float X { get; set; } public float X { get; set; }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHold.cs
View File

@ -14,6 +14,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
public double Duration => EndTime - StartTime; public double Duration => EndTime - StartTime;
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSlider.cs
View File

@ -13,6 +13,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
{ {
public float X { get; set; } public float X { get; set; }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Mania/ConvertSpinner.cs
View File

@ -17,6 +17,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Mania
public float X { get; set; } public float X { get; set; }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHit.cs
View File

@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
public int ComboOffset { get; set; } public int ComboOffset { get; set; }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSlider.cs
View File

@ -22,6 +22,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
public int ComboOffset { get; set; } public int ComboOffset { get; set; }
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Osu/ConvertSpinner.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Rulesets.Objects.Legacy.Osu
public float Y => Position.Y; public float Y => Position.Y;
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
public bool NewCombo { get; set; } public bool NewCombo { get; set; }

2
osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHit.cs
View File

@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// </summary> /// </summary>
internal sealed class ConvertHit : HitObject internal sealed class ConvertHit : HitObject
{ {
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSlider.cs
View File

@ -10,6 +10,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
/// </summary> /// </summary>
internal sealed class ConvertSlider : Legacy.ConvertSlider internal sealed class ConvertSlider : Legacy.ConvertSlider
{ {
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

2
osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertSpinner.cs
View File

@ -15,6 +15,6 @@ namespace osu.Game.Rulesets.Objects.Legacy.Taiko
public double Duration => EndTime - StartTime; public double Duration => EndTime - StartTime;
protected override HitWindows CreateHitWindows() => null; protected override HitWindows CreateHitWindows() => HitWindows.Empty;
} }
} }

37
osu.Game/Rulesets/Scoring/HitWindows.cs
View File

@ -3,6 +3,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Rulesets.Objects; using osu.Game.Rulesets.Objects;
@ -30,6 +32,18 @@ namespace osu.Game.Rulesets.Scoring
private double meh; private double meh;
private double miss; private double miss;
/// <summary>
/// An empty <see cref="HitWindows"/> with only <see cref="HitResult.Miss"/> and <see cref="HitResult.Perfect"/>.
/// No time values are provided (meaning instantaneous hit or miss).
/// </summary>
public static HitWindows Empty => new EmptyHitWindows();
public HitWindows()
{
Debug.Assert(GetRanges().Any(r => r.Result == HitResult.Miss), $"{nameof(GetRanges)} should always contain {nameof(HitResult.Miss)}");
Debug.Assert(GetRanges().Any(r => r.Result != HitResult.Miss), $"{nameof(GetRanges)} should always contain at least one result type other than {nameof(HitResult.Miss)}.");
}
/// <summary> /// <summary>
/// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit. /// Retrieves the <see cref="HitResult"/> with the largest hit window that produces a successful hit.
/// </summary> /// </summary>
@ -168,6 +182,29 @@ namespace osu.Game.Rulesets.Scoring
/// Defaults are provided but can be overridden to customise for a ruleset. /// Defaults are provided but can be overridden to customise for a ruleset.
/// </summary> /// </summary>
protected virtual DifficultyRange[] GetRanges() => base_ranges; protected virtual DifficultyRange[] GetRanges() => base_ranges;
public class EmptyHitWindows : HitWindows
{
private static readonly DifficultyRange[] ranges =
{
new DifficultyRange(HitResult.Perfect, 0, 0, 0),
new DifficultyRange(HitResult.Miss, 0, 0, 0),
};
public override bool IsHitResultAllowed(HitResult result)
{
switch (result)
{
case HitResult.Perfect:
case HitResult.Miss:
return true;
}
return false;
}
protected override DifficultyRange[] GetRanges() => ranges;
}
} }
public struct DifficultyRange public struct DifficultyRange

4
osu.Game/Rulesets/UI/DrawableRuleset.cs
View File

@ -426,11 +426,11 @@ namespace osu.Game.Rulesets.UI
{ {
foreach (var h in Objects) foreach (var h in Objects)
{ {
if (h.HitWindows != null) if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return h.HitWindows; return h.HitWindows;
foreach (var n in h.NestedHitObjects) foreach (var n in h.NestedHitObjects)
if (n.HitWindows != null) if (h.HitWindows.WindowFor(HitResult.Miss) > 0)
return n.HitWindows; return n.HitWindows;
} }

2
osu.Game/Screens/Play/HUD/HitErrorDisplay.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Screens.Play.HUD
private void onNewJudgement(JudgementResult result) private void onNewJudgement(JudgementResult result)
{ {
if (result.HitObject.HitWindows == null) if (result.HitObject.HitWindows.WindowFor(HitResult.Miss) == 0)
return; return;
foreach (var c in Children) foreach (var c in Children)