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

Fix argon health bar folding in on itself

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-11-15 13:33:12 +09:00
parent 71714f8f6e
commit 8cd1f08a92
No known key found for this signature in database
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
osu.Game/Screens/Play/HUD/ArgonHealthDisplay.cs
View File

@ -89,6 +89,11 @@ namespace osu.Game.Screens.Play.HUD
public const float MAIN_PATH_RADIUS = 10f; public const float MAIN_PATH_RADIUS = 10f;
private const float curve_start_offset = 70;
private const float curve_end_offset = 40;
private const float padding = MAIN_PATH_RADIUS * 2;
private const float curve_smoothness = 10;
private readonly LayoutValue drawSizeLayout = new LayoutValue(Invalidation.DrawSize); private readonly LayoutValue drawSizeLayout = new LayoutValue(Invalidation.DrawSize);
public ArgonHealthDisplay() public ArgonHealthDisplay()
@ -248,11 +253,17 @@ namespace osu.Game.Screens.Play.HUD
private void updatePath() private void updatePath()
{ {
float barLength = DrawWidth - MAIN_PATH_RADIUS * 2; float usableWidth = DrawWidth - padding;
float curveStart = barLength - 70;
float curveEnd = barLength - 40;
const float curve_smoothness = 10; if (usableWidth < 0) enforceMinimumWidth();
// the display starts curving at `curve_start_offset` units from the right and ends curving at `curve_end_offset`.
// to ensure that the curve is symmetric when it starts being narrow enough, add a `curve_end_offset` to the left side too.
const float rescale_cutoff = curve_start_offset + curve_end_offset;
float barLength = Math.Max(DrawWidth - padding, rescale_cutoff);
float curveStart = barLength - curve_start_offset;
float curveEnd = barLength - curve_end_offset;
Vector2 diagonalDir = (new Vector2(curveEnd, BarHeight.Value) - new Vector2(curveStart, 0)).Normalized(); Vector2 diagonalDir = (new Vector2(curveEnd, BarHeight.Value) - new Vector2(curveStart, 0)).Normalized();
@ -268,6 +279,9 @@ namespace osu.Game.Screens.Play.HUD
new PathControlPoint(new Vector2(barLength, BarHeight.Value)), new PathControlPoint(new Vector2(barLength, BarHeight.Value)),
}); });
if (DrawWidth - padding < rescale_cutoff)
rescalePathProportionally();
List<Vector2> vertices = new List<Vector2>(); List<Vector2> vertices = new List<Vector2>();
barPath.GetPathToProgress(vertices, 0.0, 1.0); barPath.GetPathToProgress(vertices, 0.0, 1.0);
@ -276,6 +290,20 @@ namespace osu.Game.Screens.Play.HUD
glowBar.Vertices = vertices; glowBar.Vertices = vertices;
updatePathVertices(); updatePathVertices();
void enforceMinimumWidth()
{
var relativeAxes = RelativeSizeAxes;
RelativeSizeAxes = Axes.None;
Width = padding;
RelativeSizeAxes = relativeAxes;
}
void rescalePathProportionally()
{
foreach (var point in barPath.ControlPoints)
point.Position = new Vector2(point.Position.X / barLength * (DrawWidth - padding), point.Position.Y);
}
} }
private void updatePathVertices() private void updatePathVertices()