h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 15:33:21 +08:00
Code Issues Releases Wiki Activity

Merge pull request #25415 from Poyo-SSB-forks/unify-ur

Browse Source 
Change unstable rate calculation to account for rate-change mods
This commit is contained in:
Dan Balasescu 2023-11-23 09:53:28 +09:00 committed by GitHub
commit 30309cdf11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 98 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
osu.Game.Tests/NonVisual/Ranking/UnstableRateTest.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Tests.NonVisual.Ranking
public void TestDistributedHits() public void TestDistributedHits()
{ {
var events = Enumerable.Range(-5, 11) var events = Enumerable.Range(-5, 11)
.Select(t => new HitEvent(t - 5, HitResult.Great, new HitObject(), null, null)); .Select(t => new HitEvent(t - 5, 1.0, HitResult.Great, new HitObject(), null, null));
var unstableRate = new UnstableRate(events); var unstableRate = new UnstableRate(events);
@ -33,14 +33,46 @@ namespace osu.Game.Tests.NonVisual.Ranking
{ {
var events = new[] var events = new[]
{ {
new HitEvent(-100, HitResult.Miss, new HitObject(), null, null), new HitEvent(-100, 1.0, HitResult.Miss, new HitObject(), null, null),
new HitEvent(0, HitResult.Great, new HitObject(), null, null), new HitEvent(0, 1.0, HitResult.Great, new HitObject(), null, null),
new HitEvent(200, HitResult.Meh, new HitObject { HitWindows = HitWindows.Empty }, null, null), new HitEvent(200, 1.0, HitResult.Meh, new HitObject { HitWindows = HitWindows.Empty }, null, null),
}; };
var unstableRate = new UnstableRate(events); var unstableRate = new UnstableRate(events);
Assert.AreEqual(0, unstableRate.Value); Assert.AreEqual(0, unstableRate.Value);
} }
[Test]
public void TestStaticRateChange()
{
var events = new[]
{
new HitEvent(-150, 1.5, HitResult.Great, new HitObject(), null, null),
new HitEvent(-150, 1.5, HitResult.Great, new HitObject(), null, null),
new HitEvent(150, 1.5, HitResult.Great, new HitObject(), null, null),
new HitEvent(150, 1.5, HitResult.Great, new HitObject(), null, null),
};
var unstableRate = new UnstableRate(events);
Assert.AreEqual(10 * 100, unstableRate.Value);
}
[Test]
public void TestDynamicRateChange()
{
var events = new[]
{
new HitEvent(-50, 0.5, HitResult.Great, new HitObject(), null, null),
new HitEvent(75, 0.75, HitResult.Great, new HitObject(), null, null),
new HitEvent(-100, 1.0, HitResult.Great, new HitObject(), null, null),
new HitEvent(125, 1.25, HitResult.Great, new HitObject(), null, null),
};
var unstableRate = new UnstableRate(events);
Assert.AreEqual(10 * 100, unstableRate.Value);
}
} }
} }

26
osu.Game.Tests/Visual/Gameplay/TestSceneUnstableRateCounter.cs
View File

@ -3,6 +3,7 @@
#nullable disable #nullable disable
using System;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -56,6 +57,7 @@ namespace osu.Game.Tests.Visual.Gameplay
scoreProcessor.RevertResult( scoreProcessor.RevertResult(
new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement()) new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
{ {
GameplayRate = 1.0,
TimeOffset = 25, TimeOffset = 25,
Type = HitResult.Perfect, Type = HitResult.Perfect,
}); });
@ -80,6 +82,27 @@ namespace osu.Game.Tests.Visual.Gameplay
AddUntilStep("UR = 250", () => counter.Current.Value == 250.0); AddUntilStep("UR = 250", () => counter.Current.Value == 250.0);
} }
[Test]
public void TestStaticRateChange()
{
AddStep("Create Display", recreateDisplay);
AddRepeatStep("Set UR to 250 at 1.5x", () => applyJudgement(25, true, 1.5), 4);
AddUntilStep("UR = 250/1.5", () => counter.Current.Value == Math.Round(250.0 / 1.5));
}
[Test]
public void TestDynamicRateChange()
{
AddStep("Create Display", recreateDisplay);
AddRepeatStep("Set UR to 100 at 1.0x", () => applyJudgement(10, true, 1.0), 4);
AddRepeatStep("Bring UR to 100 at 1.5x", () => applyJudgement(15, true, 1.5), 4);
AddUntilStep("UR = 100", () => counter.Current.Value == 100.0);
}
private void recreateDisplay() private void recreateDisplay()
{ {
Clear(); Clear();
@ -92,7 +115,7 @@ namespace osu.Game.Tests.Visual.Gameplay
}); });
} }
private void applyJudgement(double offsetMs, bool alt) private void applyJudgement(double offsetMs, bool alt, double gameplayRate = 1.0)
{ {
double placement = offsetMs; double placement = offsetMs;
@ -105,6 +128,7 @@ namespace osu.Game.Tests.Visual.Gameplay
scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement()) scoreProcessor.ApplyResult(new JudgementResult(new HitCircle { HitWindows = hitWindows }, new Judgement())
{ {
TimeOffset = placement, TimeOffset = placement,
GameplayRate = gameplayRate,
Type = HitResult.Perfect, Type = HitResult.Perfect,
}); });
} }

28
osu.Game.Tests/Visual/Ranking/TestSceneHitEventTimingDistributionGraph.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestAroundCentre() public void TestAroundCentre()
{ {
createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList()); createTest(Enumerable.Range(-150, 300).Select(i => new HitEvent(i / 50f, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
} }
[Test] [Test]
@ -57,12 +57,12 @@ namespace osu.Game.Tests.Visual.Ranking
{ {
createTest(new List<HitEvent> createTest(new List<HitEvent>
{ {
new HitEvent(-7, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(-7, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
new HitEvent(-6, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(-6, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
new HitEvent(-5, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(-5, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
new HitEvent(5, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(5, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
new HitEvent(6, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(6, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
new HitEvent(7, HitResult.Perfect, placeholder_object, placeholder_object, null), new HitEvent(7, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null),
}); });
} }
@ -78,7 +78,7 @@ namespace osu.Game.Tests.Visual.Ranking
: offset > 16 ? HitResult.Good : offset > 16 ? HitResult.Good
: offset > 8 ? HitResult.Great : offset > 8 ? HitResult.Great
: HitResult.Perfect; : HitResult.Perfect;
return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null); return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
}).ToList()); }).ToList());
} }
@ -95,7 +95,7 @@ namespace osu.Game.Tests.Visual.Ranking
: offset > 8 ? HitResult.Great : offset > 8 ? HitResult.Great
: HitResult.Perfect; : HitResult.Perfect;
return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null); return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
}); });
var narrow = CreateDistributedHitEvents(0, 50).Select(h => var narrow = CreateDistributedHitEvents(0, 50).Select(h =>
{ {
@ -106,7 +106,7 @@ namespace osu.Game.Tests.Visual.Ranking
: offset > 10 ? HitResult.Good : offset > 10 ? HitResult.Good
: offset > 5 ? HitResult.Great : offset > 5 ? HitResult.Great
: HitResult.Perfect; : HitResult.Perfect;
return new HitEvent(h.TimeOffset, result, placeholder_object, placeholder_object, null); return new HitEvent(h.TimeOffset, 1.0, result, placeholder_object, placeholder_object, null);
}); });
createTest(wide.Concat(narrow).ToList()); createTest(wide.Concat(narrow).ToList());
} }
@ -114,7 +114,7 @@ namespace osu.Game.Tests.Visual.Ranking
[Test] [Test]
public void TestZeroTimeOffset() public void TestZeroTimeOffset()
{ {
createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList()); createTest(Enumerable.Range(0, 100).Select(_ => new HitEvent(0, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null)).ToList());
} }
[Test] [Test]
@ -129,9 +129,9 @@ namespace osu.Game.Tests.Visual.Ranking
createTest(Enumerable.Range(0, 100).Select(i => createTest(Enumerable.Range(0, 100).Select(i =>
{ {
if (i % 2 == 0) if (i % 2 == 0)
return new HitEvent(0, HitResult.Perfect, placeholder_object, placeholder_object, null); return new HitEvent(0, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null);
return new HitEvent(30, HitResult.Miss, placeholder_object, placeholder_object, null); return new HitEvent(30, 1.0, HitResult.Miss, placeholder_object, placeholder_object, null);
}).ToList()); }).ToList());
} }
@ -162,7 +162,7 @@ namespace osu.Game.Tests.Visual.Ranking
int count = (int)(Math.Pow(range - Math.Abs(i - range), 2)) / 10; int count = (int)(Math.Pow(range - Math.Abs(i - range), 2)) / 10;
for (int j = 0; j < count; j++) for (int j = 0; j < count; j++)
hitEvents.Add(new HitEvent(centre + i - range, HitResult.Perfect, placeholder_object, placeholder_object, null)); hitEvents.Add(new HitEvent(centre + i - range, 1.0, HitResult.Perfect, placeholder_object, placeholder_object, null));
} }
return hitEvents; return hitEvents;

5
osu.Game/Rulesets/Judgements/JudgementResult.cs
View File

@ -54,6 +54,11 @@ namespace osu.Game.Rulesets.Judgements
/// </remarks> /// </remarks>
public double TimeAbsolute => RawTime != null ? Math.Min(RawTime.Value, HitObject.GetEndTime() + HitObject.MaximumJudgementOffset) : HitObject.GetEndTime(); public double TimeAbsolute => RawTime != null ? Math.Min(RawTime.Value, HitObject.GetEndTime() + HitObject.MaximumJudgementOffset) : HitObject.GetEndTime();
/// <summary>
/// The gameplay rate at the time this <see cref="JudgementResult"/> occurred.
/// </summary>
public double? GameplayRate { get; internal set; }
/// <summary> /// <summary>
/// The combo prior to this <see cref="JudgementResult"/> occurring. /// The combo prior to this <see cref="JudgementResult"/> occurring.
/// </summary> /// </summary>

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

@ -704,6 +704,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
} }
Result.RawTime = Time.Current; Result.RawTime = Time.Current;
Result.GameplayRate = (Clock as IGameplayClock)?.GetTrueGameplayRate() ?? Clock.Rate;
if (Result.HasResult) if (Result.HasResult)
updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss); updateState(Result.IsHit ? ArmedState.Hit : ArmedState.Miss);

11
osu.Game/Rulesets/Scoring/HitEvent.cs
View File

@ -19,6 +19,11 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
public readonly double TimeOffset; public readonly double TimeOffset;
/// <summary>
/// The true gameplay rate at the time of the event.
/// </summary>
public readonly double? GameplayRate;
/// <summary> /// <summary>
/// The hit result. /// The hit result.
/// </summary> /// </summary>
@ -46,12 +51,14 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
/// <param name="timeOffset">The time offset from the end of <paramref name="hitObject"/> at which the event occurs.</param> /// <param name="timeOffset">The time offset from the end of <paramref name="hitObject"/> at which the event occurs.</param>
/// <param name="result">The <see cref="HitResult"/>.</param> /// <param name="result">The <see cref="HitResult"/>.</param>
/// <param name="gameplayRate">The true gameplay rate at the time of the event.</param>
/// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param> /// <param name="hitObject">The <see cref="HitObject"/> that triggered the event.</param>
/// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param> /// <param name="lastHitObject">The previous <see cref="HitObject"/>.</param>
/// <param name="position">A position corresponding to the event.</param> /// <param name="position">A position corresponding to the event.</param>
public HitEvent(double timeOffset, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position) public HitEvent(double timeOffset, double? gameplayRate, HitResult result, HitObject hitObject, [CanBeNull] HitObject lastHitObject, [CanBeNull] Vector2? position)
{ {
TimeOffset = timeOffset; TimeOffset = timeOffset;
GameplayRate = gameplayRate;
Result = result; Result = result;
HitObject = hitObject; HitObject = hitObject;
LastHitObject = lastHitObject; LastHitObject = lastHitObject;
@ -63,6 +70,6 @@ namespace osu.Game.Rulesets.Scoring
/// </summary> /// </summary>
/// <param name="positionOffset">The positional offset.</param> /// <param name="positionOffset">The positional offset.</param>
/// <returns>The new <see cref="HitEvent"/>.</returns> /// <returns>The new <see cref="HitEvent"/>.</returns>
public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, Result, HitObject, LastHitObject, positionOffset); public HitEvent With(Vector2? positionOffset) => new HitEvent(TimeOffset, GameplayRate, Result, HitObject, LastHitObject, positionOffset);
} }
} }

6
osu.Game/Rulesets/Scoring/HitEventExtensions.cs
View File

@ -3,6 +3,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
namespace osu.Game.Rulesets.Scoring namespace osu.Game.Rulesets.Scoring
@ -18,7 +19,10 @@ namespace osu.Game.Rulesets.Scoring
/// </returns> /// </returns>
public static double? CalculateUnstableRate(this IEnumerable<HitEvent> hitEvents) public static double? CalculateUnstableRate(this IEnumerable<HitEvent> hitEvents)
{ {
double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset).ToArray(); Debug.Assert(hitEvents.All(ev => ev.GameplayRate != null));
// Division by gameplay rate is to account for TimeOffset scaling with gameplay rate.
double[] timeOffsets = hitEvents.Where(affectsUnstableRate).Select(ev => ev.TimeOffset / ev.GameplayRate!.Value).ToArray();
return 10 * standardDeviation(timeOffsets); return 10 * standardDeviation(timeOffsets);
} }

2
osu.Game/Rulesets/Scoring/ScoreProcessor.cs
View File

@ -252,7 +252,7 @@ namespace osu.Game.Rulesets.Scoring
/// <param name="result">The <see cref="JudgementResult"/> to describe.</param> /// <param name="result">The <see cref="JudgementResult"/> to describe.</param>
/// <returns>The <see cref="HitEvent"/>.</returns> /// <returns>The <see cref="HitEvent"/>.</returns>
protected virtual HitEvent CreateHitEvent(JudgementResult result) protected virtual HitEvent CreateHitEvent(JudgementResult result)
=> new HitEvent(result.TimeOffset, result.Type, result.HitObject, lastHitObject, null); => new HitEvent(result.TimeOffset, result.GameplayRate, result.Type, result.HitObject, lastHitObject, null);
protected sealed override void RevertResultInternal(JudgementResult result) protected sealed override void RevertResultInternal(JudgementResult result)
{ {

2
osu.Game/Screens/Utility/CircleGameplay.cs
View File

@ -224,7 +224,7 @@ namespace osu.Game.Screens.Utility
.FadeOut(duration) .FadeOut(duration)
.ScaleTo(1.5f, duration); .ScaleTo(1.5f, duration);
HitEvent = new HitEvent(Clock.CurrentTime - HitTime, HitResult.Good, new HitObject HitEvent = new HitEvent(Clock.CurrentTime - HitTime, 1.0, HitResult.Good, new HitObject
{ {
HitWindows = new HitWindows(), HitWindows = new HitWindows(),
}, null, null); }, null, null);

2
osu.Game/Screens/Utility/ScrollingGameplay.cs
View File

@ -186,7 +186,7 @@ namespace osu.Game.Screens.Utility
.FadeOut(duration / 2) .FadeOut(duration / 2)
.ScaleTo(1.5f, duration / 2); .ScaleTo(1.5f, duration / 2);
HitEvent = new HitEvent(Clock.CurrentTime - HitTime, HitResult.Good, new HitObject HitEvent = new HitEvent(Clock.CurrentTime - HitTime, 1.0, HitResult.Good, new HitObject
{ {
HitWindows = new HitWindows(), HitWindows = new HitWindows(),
}, null, null); }, null, null);