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

chore(osu.Game): colorize bars by OD on HitEventTimingDistributionGraph

Browse Source
This commit is contained in:
Acid Chicken (硫酸鶏) 2022-09-05 02:02:38 +09:00
parent 074d2a7a3a
commit 0af6b3dc0f
No known key found for this signature in database
GPG Key ID: 3E87B98A3F6BAB99
1 changed files with 84 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
osu.Game/Screens/Ranking/Statistics/HitEventTimingDistributionGraph.cs
View File

@ -7,7 +7,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
@ -48,6 +47,9 @@ namespace osu.Game.Screens.Ranking.Statistics
/// </summary> /// </summary>
private readonly IReadOnlyList<HitEvent> hitEvents; private readonly IReadOnlyList<HitEvent> hitEvents;
[Resolved]
private OsuColour colours { get; set; }
/// <summary> /// <summary>
/// Creates a new <see cref="HitEventTimingDistributionGraph"/>. /// Creates a new <see cref="HitEventTimingDistributionGraph"/>.
/// </summary> /// </summary>
@ -57,7 +59,7 @@ namespace osu.Game.Screens.Ranking.Statistics
this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList(); this.hitEvents = hitEvents.Where(e => !(e.HitObject.HitWindows is HitWindows.EmptyHitWindows) && e.Result.IsHit()).ToList();
} }
private int[] bins; private IDictionary<HitResult, int>[] bins;
private double binSize; private double binSize;
private double hitOffset; private double hitOffset;
@ -69,7 +71,7 @@ namespace osu.Game.Screens.Ranking.Statistics
if (hitEvents == null || hitEvents.Count == 0) if (hitEvents == null || hitEvents.Count == 0)
return; return;
bins = new int[total_timing_distribution_bins]; bins = Enumerable.Range(0, total_timing_distribution_bins).Select(_ => new Dictionary<HitResult, int>()).ToArray<IDictionary<HitResult, int>>();
binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins); binSize = Math.Ceiling(hitEvents.Max(e => Math.Abs(e.TimeOffset)) / timing_distribution_bins);
@ -89,7 +91,8 @@ namespace osu.Game.Screens.Ranking.Statistics
{ {
bool roundUp = true; bool roundUp = true;
Array.Clear(bins, 0, bins.Length); foreach (var bin in bins)
bin.Clear();
foreach (var e in hitEvents) foreach (var e in hitEvents)
{ {
@ -110,23 +113,29 @@ namespace osu.Game.Screens.Ranking.Statistics
// may be out of range when applying an offset. for such cases we can just drop the results. // may be out of range when applying an offset. for such cases we can just drop the results.
if (index >= 0 && index < bins.Length) if (index >= 0 && index < bins.Length)
bins[index]++; {
bins[index].TryGetValue(e.Result, out int value);
bins[index][e.Result] = ++value;
}
} }
if (barDrawables != null) if (barDrawables != null)
{ {
for (int i = 0; i < barDrawables.Length; i++) for (int i = 0; i < barDrawables.Length; i++)
{ {
barDrawables[i].UpdateOffset(bins[i]); barDrawables[i].UpdateOffset(bins[i].Sum(b => b.Value));
} }
} }
else else
{ {
int maxCount = bins.Max(); int maxCount = bins.Max(b => b.Values.Sum());
barDrawables = new Bar[total_timing_distribution_bins]; barDrawables = new Bar[total_timing_distribution_bins];
for (int i = 0; i < barDrawables.Length; i++) for (int i = 0; i < barDrawables.Length; i++)
barDrawables[i] = new Bar(bins[i], maxCount, i == timing_distribution_centre_bin_index); {
IReadOnlyList<BarValue> values = bins[i].Select(b => new BarValue(b.Key.OrderingIndex(), b.Value, colours.DrawForHitResult(b.Key))).OrderBy(b => b.Index).ToList();
barDrawables[i] = new Bar(values, maxCount, i == timing_distribution_centre_bin_index);
}
Container axisFlow; Container axisFlow;
@ -207,52 +216,102 @@ namespace osu.Game.Screens.Ranking.Statistics
} }
} }
private readonly struct BarValue
{
public readonly int Index;
public readonly float Value;
public readonly Color4 Colour;
public BarValue(int index, float value, Color4 colour)
{
Index = index;
Value = value;
Colour = colour;
}
}
private class Bar : CompositeDrawable private class Bar : CompositeDrawable
{ {
private readonly float value; private float totalValue => values.Sum(v => v.Value);
private float basalHeight => BoundingBox.Width / BoundingBox.Height;
private float availableHeight => 1 - basalHeight;
private readonly IReadOnlyList<BarValue> values;
private readonly float maxValue; private readonly float maxValue;
private readonly Circle boxOriginal; private readonly Circle[] boxOriginals;
private Circle boxAdjustment; private Circle boxAdjustment;
private const float minimum_height = 0.05f; public Bar(IReadOnlyList<BarValue> values, float maxValue, bool isCentre)
public Bar(float value, float maxValue, bool isCentre)
{ {
this.value = value; this.values = values;
this.maxValue = maxValue; this.maxValue = maxValue;
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Masking = true; Masking = true;
InternalChildren = new Drawable[] if (values.Any())
{ {
boxOriginal = new Circle boxOriginals = values.Select(v => new Circle
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Colour = isCentre ? Color4.White : Color4Extensions.FromHex("#66FFCC"), Colour = isCentre ? Color4.White : v.Colour,
Height = minimum_height, Height = 0,
}, }).ToArray();
}; InternalChildren = boxOriginals.Reverse().ToArray();
}
else
{
InternalChildren = boxOriginals = new[]
{
new Circle
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Colour = isCentre ? Color4.White : Color4.Gray,
Height = 0,
},
};
}
} }
private const double duration = 300; private const double duration = 300;
private float offsetForValue(float value)
{
return availableHeight * value / maxValue;
}
private float heightForValue(float value)
{
return basalHeight + offsetForValue(value);
}
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
float height = Math.Clamp(value / maxValue, minimum_height, 1); float offsetValue = 0;
if (height > minimum_height) if (values.Any())
boxOriginal.ResizeHeightTo(height, duration, Easing.OutQuint); {
for (int i = 0; i < values.Count; i++)
{
boxOriginals[i].Y = BoundingBox.Height * offsetForValue(offsetValue);
boxOriginals[i].Delay(duration * i).ResizeHeightTo(heightForValue(values[i].Value), duration, Easing.OutQuint);
offsetValue -= values[i].Value;
}
}
else
boxOriginals.Single().ResizeHeightTo(basalHeight, duration, Easing.OutQuint);
} }
public void UpdateOffset(float adjustment) public void UpdateOffset(float adjustment)
{ {
bool hasAdjustment = adjustment != value && adjustment / maxValue >= minimum_height; bool hasAdjustment = adjustment != totalValue;
if (boxAdjustment == null) if (boxAdjustment == null)
{ {
@ -271,7 +330,7 @@ namespace osu.Game.Screens.Ranking.Statistics
}); });
} }
boxAdjustment.ResizeHeightTo(Math.Clamp(adjustment / maxValue, minimum_height, 1), duration, Easing.OutQuint); boxAdjustment.ResizeHeightTo(heightForValue(adjustment), duration, Easing.OutQuint);
boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint); boxAdjustment.FadeTo(!hasAdjustment ? 0 : 1, duration, Easing.OutQuint);
} }
} }