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

Rename Judgement{Tally -> CountController}

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-06-26 19:30:04 +02:00
parent 8d91580dc1
commit 7200855d46
No known key found for this signature in database
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Tests/Visual/Gameplay/TestSceneJudgementCounter.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Tests.Visual.Gameplay
public partial class TestSceneJudgementCounter : OsuTestScene public partial class TestSceneJudgementCounter : OsuTestScene
{ {
private ScoreProcessor scoreProcessor = null!; private ScoreProcessor scoreProcessor = null!;
private JudgementTally judgementTally = null!; private JudgementCountController judgementCountController = null!;
private TestJudgementCounterDisplay counterDisplay = null!; private TestJudgementCounterDisplay counterDisplay = null!;
private DependencyProvidingContainer content = null!; private DependencyProvidingContainer content = null!;
@ -47,11 +47,11 @@ namespace osu.Game.Tests.Visual.Gameplay
CachedDependencies = new (Type, object)[] { (typeof(ScoreProcessor), scoreProcessor), (typeof(Ruleset), ruleset) }, CachedDependencies = new (Type, object)[] { (typeof(ScoreProcessor), scoreProcessor), (typeof(Ruleset), ruleset) },
Children = new Drawable[] Children = new Drawable[]
{ {
judgementTally = new JudgementTally(), judgementCountController = new JudgementCountController(),
content = new DependencyProvidingContainer content = new DependencyProvidingContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
CachedDependencies = new (Type, object)[] { (typeof(JudgementTally), judgementTally) }, CachedDependencies = new (Type, object)[] { (typeof(JudgementCountController), judgementCountController) },
} }
}, },
}; };

2
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementTally.cs → osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCountController.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
/// Keeps track of judgements for a current play session, exposing bindable counts which can /// Keeps track of judgements for a current play session, exposing bindable counts which can
/// be used for display purposes. /// be used for display purposes.
/// </summary> /// </summary>
public partial class JudgementTally : CompositeDrawable public partial class JudgementCountController : CompositeDrawable
{ {
[Resolved] [Resolved]
private ScoreProcessor scoreProcessor { get; set; } = null!; private ScoreProcessor scoreProcessor { get; set; } = null!;

4
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounter.cs
View File

@ -18,9 +18,9 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
public BindableBool ShowName = new BindableBool(); public BindableBool ShowName = new BindableBool();
public Bindable<FillDirection> Direction = new Bindable<FillDirection>(); public Bindable<FillDirection> Direction = new Bindable<FillDirection>();
public readonly JudgementTally.JudgementCount Result; public readonly JudgementCountController.JudgementCount Result;
public JudgementCounter(JudgementTally.JudgementCount result) => Result = result; public JudgementCounter(JudgementCountController.JudgementCount result) => Result = result;
public OsuSpriteText ResultName = null!; public OsuSpriteText ResultName = null!;
private FillFlowContainer flowContainer = null!; private FillFlowContainer flowContainer = null!;

6
osu.Game/Screens/Play/HUD/JudgementCounter/JudgementCounterDisplay.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
public BindableBool ShowMaxJudgement { get; set; } = new BindableBool(true); public BindableBool ShowMaxJudgement { get; set; } = new BindableBool(true);
[Resolved] [Resolved]
private JudgementTally tally { get; set; } = null!; private JudgementCountController judgementCountController { get; set; } = null!;
protected FillFlowContainer<JudgementCounter> CounterFlow = null!; protected FillFlowContainer<JudgementCounter> CounterFlow = null!;
@ -49,7 +49,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
AutoSizeAxes = Axes.Both AutoSizeAxes = Axes.Both
}; };
foreach (var result in tally.Results) foreach (var result in judgementCountController.Results)
CounterFlow.Add(createCounter(result)); CounterFlow.Add(createCounter(result));
} }
@ -123,7 +123,7 @@ namespace osu.Game.Screens.Play.HUD.JudgementCounter
} }
} }
private JudgementCounter createCounter(JudgementTally.JudgementCount info) => private JudgementCounter createCounter(JudgementCountController.JudgementCount info) =>
new JudgementCounter(info) new JudgementCounter(info)
{ {
State = { Value = Visibility.Hidden }, State = { Value = Visibility.Hidden },

4
osu.Game/Screens/Play/HUDOverlay.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Screens.Play
public readonly InputCountController InputCountController; public readonly InputCountController InputCountController;
[Cached] [Cached]
private readonly JudgementTally tally; private readonly JudgementCountController judgementCountController;
public Bindable<bool> ShowHealthBar = new Bindable<bool>(true); public Bindable<bool> ShowHealthBar = new Bindable<bool>(true);
@ -118,7 +118,7 @@ namespace osu.Game.Screens.Play
{ {
CreateFailingLayer(), CreateFailingLayer(),
//Needs to be initialized before skinnable drawables. //Needs to be initialized before skinnable drawables.
tally = new JudgementTally(), judgementCountController = new JudgementCountController(),
mainComponents = new HUDComponentsContainer { AlwaysPresent = true, }, mainComponents = new HUDComponentsContainer { AlwaysPresent = true, },
rulesetComponents = drawableRuleset != null rulesetComponents = drawableRuleset != null
? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, } ? new HUDComponentsContainer(drawableRuleset.Ruleset.RulesetInfo) { AlwaysPresent = true, }