Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add number as hiterror meter moving average style #35818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dani211e wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add number as hiterror meter moving average style #35818

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 74 additions & 19 deletions osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
Expand All @@ -17,6 +18,7 @@
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Localisation.HUD;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Scoring;
Expand All @@ -41,6 +43,9 @@ public partial class BarHitErrorMeter : HitErrorMeter
[SettingSource(typeof(BarHitErrorMeterStrings), nameof(BarHitErrorMeterStrings.ShowMovingAverage), nameof(BarHitErrorMeterStrings.ShowMovingAverageDescription))]
public Bindable<bool> ShowMovingAverage { get; } = new BindableBool(true);

[SettingSource("Moving average style", "How to display the moving average")]
public Bindable<MovingAverageStyles> MovingAverageStyle { get; } = new Bindable<MovingAverageStyles>(MovingAverageStyles.Chevron);

[SettingSource(typeof(BarHitErrorMeterStrings), nameof(BarHitErrorMeterStrings.CentreMarkerStyle), nameof(BarHitErrorMeterStrings.CentreMarkerStyleDescription))]
public Bindable<CentreMarkerStyles> CentreMarkerStyle { get; } = new Bindable<CentreMarkerStyles>(CentreMarkerStyles.Circle);

Expand All @@ -53,13 +58,15 @@ public partial class BarHitErrorMeter : HitErrorMeter

private const int centre_marker_size = 8;

private const float chevron_size = 8;

private double maxHitWindow;

private double floatingAverage;
private readonly Bindable<double> floatingAverage = new Bindable<double>();

private readonly DrawablePool<JudgementLine> judgementLinePool = new DrawablePool<JudgementLine>(50);

private SpriteIcon arrow = null!;
private Drawable movingAverage = null!;
private UprightAspectMaintainingContainer labelEarly = null!;
private UprightAspectMaintainingContainer labelLate = null!;

Expand All @@ -69,7 +76,7 @@ public partial class BarHitErrorMeter : HitErrorMeter
private Container judgementsContainer = null!;

private Container colourBars = null!;
private Container arrowContainer = null!;
private Container movingAverageContainer = null!;

private (HitResult result, double length)[] hitWindows = null!;

Expand All @@ -85,7 +92,6 @@ private void load()
{
const int bar_height = 200;
const int bar_width = 2;
const float chevron_size = 8;

hitWindows = HitWindows.GetAllAvailableWindows().Where(w => w.result.IsHit()).ToArray();

Expand Down Expand Up @@ -150,7 +156,7 @@ private void load()
},
}
},
arrowContainer = new Container
movingAverageContainer = new Container
{
Name = "average chevron",
Anchor = Anchor.CentreLeft,
Expand All @@ -160,15 +166,6 @@ private void load()
RelativeSizeAxes = Axes.Y,
Alpha = 0,
Scale = new Vector2(0, 1),
Child = arrow = new SpriteIcon
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
RelativePositionAxes = Axes.Y,
Y = 0.5f,
Icon = FontAwesome.Solid.ChevronRight,
Size = new Vector2(chevron_size),
}
},
}
};
Expand All @@ -185,19 +182,21 @@ protected override void LoadComplete()

CentreMarkerStyle.BindValueChanged(style => recreateCentreMarker(style.NewValue), true);
LabelStyle.BindValueChanged(style => recreateLabels(style.NewValue), true);
MovingAverageStyle.BindValueChanged(style => recreateMovingAverage(style.NewValue), true);

ColourBarVisibility.BindValueChanged(visible =>
{
colourBarsEarly.FadeTo(visible.NewValue ? 1 : 0, 500, Easing.OutQuint);
colourBarsLate.FadeTo(visible.NewValue ? 1 : 0, 500, Easing.OutQuint);
}, true);

// delay the appearance animations for only the initial appearance.
using (arrowContainer.BeginDelayedSequence(450))
using (movingAverageContainer.BeginDelayedSequence(450))
{
ShowMovingAverage.BindValueChanged(visible =>
{
arrowContainer.FadeTo(visible.NewValue ? 1 : 0, 250, Easing.OutQuint);
arrowContainer.ScaleTo(visible.NewValue ? new Vector2(1) : new Vector2(0, 1), 250, Easing.OutQuint);
movingAverageContainer.FadeTo(visible.NewValue ? 1 : 0, 250, Easing.OutQuint);
movingAverageContainer.ScaleTo(visible.NewValue ? new Vector2(1) : new Vector2(0, 1), 250, Easing.OutQuint);
}, true);
}
}
Expand Down Expand Up @@ -339,6 +338,41 @@ private void recreateLabels(LabelStyles style)
labelLate.FadeInFromZero(500);
}

private void recreateMovingAverage(MovingAverageStyles style)
{
switch (style)
{
case MovingAverageStyles.Chevron:
movingAverageContainer.Child = movingAverage = new SpriteIcon
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
RelativePositionAxes = Axes.Y,
Y = 0.5f,
Icon = FontAwesome.Solid.ChevronRight,
Size = new Vector2(chevron_size),
};
break;

case MovingAverageStyles.Number:
movingAverageContainer.Child = movingAverage = new MovingAverageCounter
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
RelativePositionAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Y = 0.5f,
Current = { BindTarget = floatingAverage },
};
break;

default:
throw new ArgumentOutOfRangeException(nameof(style), style, null);
}

movingAverage.FadeInFromZero(500);
}

private void createColourBars((HitResult result, double length)[] windows)
{
// max to avoid div-by-zero.
Expand Down Expand Up @@ -427,8 +461,8 @@ protected override void OnNewJudgement(JudgementResult judgement)
judgementsContainer.Add(drawableJudgement);
});

arrow.MoveToY(
getRelativeJudgementPosition(floatingAverage = floatingAverage * 0.9 + judgement.TimeOffset * 0.1)
movingAverage.MoveToY(
getRelativeJudgementPosition(floatingAverage.Value = floatingAverage.Value * 0.9 + judgement.TimeOffset * 0.1)
, arrow_move_duration, Easing.OutQuint);
}

Expand Down Expand Up @@ -485,6 +519,21 @@ protected override void PrepareForUse()
}
}

internal partial class MovingAverageCounter : RollingCounter<double>
{
protected override double RollingDuration => 175;

protected override LocalisableString FormatCount(double count) => count.ToLocalisableString("0.0");

protected override OsuSpriteText CreateSpriteText() => new OsuSpriteText
{
Anchor = Anchor.TopCentre,
Origin = Anchor.Centre,
Font = OsuFont.Torus.With(size: 8, weight: FontWeight.Bold),
Rotation = 90,
};
}

public override void Clear()
{
foreach (var j in judgementsContainer)
Expand Down Expand Up @@ -517,5 +566,11 @@ public enum LabelStyles
[LocalisableDescription(typeof(BarHitErrorMeterStrings), nameof(BarHitErrorMeterStrings.LabelStylesText))]
Text
}

public enum MovingAverageStyles
{
Chevron,
Number
}
}
}