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

Make miss points into crosses

Browse Source
This commit is contained in:
Dan Balasescu 2024-02-06 22:23:30 +09:00
parent 5850d6a578
commit 99d716f8fc
No known key found for this signature in database
1 changed files with 68 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
View File

@ -9,6 +9,7 @@ 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;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Utils; using osu.Framework.Utils;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics; using osu.Game.Graphics;
@ -191,18 +192,22 @@ namespace osu.Game.Rulesets.Osu.Statistics
for (int c = 0; c < points_per_dimension; c++) for (int c = 0; c < points_per_dimension; c++)
{ {
HitPointType pointType = Vector2.Distance(new Vector2(c + 0.5f, r + 0.5f), centre) <= innerRadius bool isHit = Vector2.Distance(new Vector2(c + 0.5f, r + 0.5f), centre) <= innerRadius;
? HitPointType.Hit
: HitPointType.Miss;
var point = new HitPoint(pointType, this) if (isHit)
{ {
BaseColour = pointType == HitPointType.Hit points[r][c] = new HitPoint(this)
? new Color4(102, 255, 204, 255) {
: new Color4(255, 102, 102, 255) BaseColour = new Color4(102, 255, 204, 255)
}; };
}
points[r][c] = point; else
{
points[r][c] = new MissPoint
{
BaseColour = new Color4(255, 102, 102, 255)
};
}
} }
} }
@ -262,33 +267,21 @@ namespace osu.Game.Rulesets.Osu.Statistics
if (r < 0 || r >= points_per_dimension || c < 0 || c >= points_per_dimension) if (r < 0 || r >= points_per_dimension || c < 0 || c >= points_per_dimension)
return; return;
PeakValue = Math.Max(PeakValue, ((HitPoint)pointGrid.Content[r][c]).Increment()); PeakValue = Math.Max(PeakValue, ((GridPoint)pointGrid.Content[r][c]).Increment());
bufferedGrid.ForceRedraw(); bufferedGrid.ForceRedraw();
} }
private partial class HitPoint : Circle private abstract partial class GridPoint : CompositeDrawable
{ {
/// <summary> /// <summary>
/// The base colour which will be lightened/darkened depending on the value of this <see cref="HitPoint"/>. /// The base colour which will be lightened/darkened depending on the value of this <see cref="HitPoint"/>.
/// </summary> /// </summary>
public Color4 BaseColour; public Color4 BaseColour;
private readonly HitPointType pointType; public override bool IsPresent => Count > 0;
private readonly AccuracyHeatmap heatmap;
public override bool IsPresent => count > 0; protected int Count { get; private set; }
public HitPoint(HitPointType pointType, AccuracyHeatmap heatmap)
{
this.pointType = pointType;
this.heatmap = heatmap;
RelativeSizeAxes = Axes.Both;
Alpha = 1;
}
private int count;
/// <summary> /// <summary>
/// Increment the value of this point by one. /// Increment the value of this point by one.
@ -296,49 +289,69 @@ namespace osu.Game.Rulesets.Osu.Statistics
/// <returns>The value after incrementing.</returns> /// <returns>The value after incrementing.</returns>
public int Increment() public int Increment()
{ {
return ++count; return ++Count;
}
}
private partial class MissPoint : GridPoint
{
public MissPoint()
{
RelativeSizeAxes = Axes.Both;
InternalChild = new SpriteIcon
{
RelativeSizeAxes = Axes.Both,
Icon = FontAwesome.Solid.Times
};
}
protected override void Update()
{
Alpha = 0.8f;
Colour = BaseColour;
}
}
private partial class HitPoint : GridPoint
{
private readonly AccuracyHeatmap heatmap;
public HitPoint(AccuracyHeatmap heatmap)
{
this.heatmap = heatmap;
RelativeSizeAxes = Axes.Both;
InternalChild = new Circle { RelativeSizeAxes = Axes.Both };
} }
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
if (pointType == HitPointType.Hit) // the point at which alpha is saturated and we begin to adjust colour lightness.
{ const float lighten_cutoff = 0.95f;
// the point at which alpha is saturated and we begin to adjust colour lightness.
const float lighten_cutoff = 0.95f;
// the amount of lightness to attribute regardless of relative value to peak point. // the amount of lightness to attribute regardless of relative value to peak point.
const float non_relative_portion = 0.2f; const float non_relative_portion = 0.2f;
float amount = 0; float amount = 0;
// give some amount of alpha regardless of relative count // give some amount of alpha regardless of relative count
amount += non_relative_portion * Math.Min(1, count / 10f); amount += non_relative_portion * Math.Min(1, Count / 10f);
// add relative portion // add relative portion
amount += (1 - non_relative_portion) * (count / heatmap.PeakValue); amount += (1 - non_relative_portion) * (Count / heatmap.PeakValue);
// apply easing // apply easing
amount = (float)Interpolation.ApplyEasing(Easing.OutQuint, Math.Min(1, amount)); amount = (float)Interpolation.ApplyEasing(Easing.OutQuint, Math.Min(1, amount));
Debug.Assert(amount <= 1); Debug.Assert(amount <= 1);
Alpha = Math.Min(amount / lighten_cutoff, 1); Alpha = Math.Min(amount / lighten_cutoff, 1);
Colour = BaseColour.Lighten(Math.Max(0, amount - lighten_cutoff)); Colour = BaseColour.Lighten(Math.Max(0, amount - lighten_cutoff));
}
else
{
Alpha = 0.8f;
Colour = BaseColour;
}
} }
} }
private enum HitPointType
{
Hit,
Miss
}
} }
} }