Fix namespacing and hitwindow source

osu.Game.Tests/Visual/Gameplay/TestSceneBarHitErrorMeter.cs

@@ -7,7 +7,6 @@ using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Rulesets.Taiko.Objects;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Catch.Objects;
-using osu.Game.Screens.Play.HitErrorDisplay;
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Judgements;
@@ -16,6 +15,7 @@ using osu.Framework.MathUtils;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
 namespace osu.Game.Tests.Visual.Gameplay
 {

osu.Game/Screens/Play/HUD/HitErrorDisplay.cs

@@ -1,19 +1,18 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System.Linq;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics;
-using osu.Game.Rulesets.Scoring;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.IEnumerableExtensions;
-using osu.Game.Beatmaps;
+using osu.Framework.Graphics;
+using osu.Framework.Graphics.Containers;
 using osu.Game.Configuration;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Screens.Play.HUD.HitErrorMeters;
 
-namespace osu.Game.Screens.Play.HitErrorDisplay
+namespace osu.Game.Screens.Play.HUD
 {
     public class HitErrorDisplay : Container<HitErrorMeter>
     {
@@ -22,13 +21,17 @@ namespace osu.Game.Screens.Play.HitErrorDisplay
 
         private readonly Bindable<ScoreMeterType> type = new Bindable<ScoreMeterType>();
 
-        private HitWindows hitWindows;
+        private readonly HitWindows hitWindows;
 
         private readonly ScoreProcessor processor;
 
-        public HitErrorDisplay(ScoreProcessor processor)
+        public HitErrorDisplay(ScoreProcessor processor, HitWindows hitWindows)
         {
             this.processor = processor;
+            this.hitWindows = hitWindows;
+
+            RelativeSizeAxes = Axes.Both;
+
             processor.NewJudgement += onNewJudgement;
         }
 
@@ -45,10 +48,9 @@ namespace osu.Game.Screens.Play.HitErrorDisplay
         }
 
         [BackgroundDependencyLoader]
-        private void load(OsuConfigManager config, Bindable<WorkingBeatmap> workingBeatmap)
+        private void load(OsuConfigManager config)
         {
             config.BindWith(OsuSetting.ScoreMeter, type);
-            hitWindows = workingBeatmap.Value.Beatmap.HitObjects.First().HitWindows;
         }
 
         protected override void LoadComplete()

osu.Game/Screens/Play/HUD/HitErrorMeters/BarHitErrorMeter.cs

@@ -2,21 +2,21 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Linq;
-using osu.Framework.Graphics;
-using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
-using osu.Game.Rulesets.Judgements;
-using osuTK.Graphics;
-using osuTK;
-using osu.Framework.Graphics.Sprites;
-using osu.Game.Rulesets.Objects;
 using osu.Framework.Allocation;
 using osu.Framework.Extensions.Color4Extensions;
+using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
+using osu.Framework.Graphics.Containers;
+using osu.Framework.Graphics.Shapes;
+using osu.Framework.Graphics.Sprites;
 using osu.Game.Graphics;
+using osu.Game.Rulesets.Judgements;
+using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Scoring;
+using osuTK;
+using osuTK.Graphics;
 
-namespace osu.Game.Screens.Play.HitErrorDisplay
+namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public class BarHitErrorMeter : HitErrorMeter
     {

osu.Game/Screens/Play/HUD/HitErrorMeters/HitErrorMeter.cs

@@ -5,7 +5,7 @@ using osu.Framework.Graphics.Containers;
 using osu.Game.Rulesets.Judgements;
 using osu.Game.Rulesets.Objects;
 
-namespace osu.Game.Screens.Play.HitErrorDisplay
+namespace osu.Game.Screens.Play.HUD.HitErrorMeters
 {
     public abstract class HitErrorMeter : CompositeDrawable
     {

osu.Game/Screens/Play/HUDOverlay.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
@@ -33,7 +34,7 @@ namespace osu.Game.Screens.Play
         public readonly HealthDisplay HealthDisplay;
         public readonly SongProgress Progress;
         public readonly ModDisplay ModDisplay;
-        public readonly HitErrorDisplay.HitErrorDisplay HitErrorDisplay;
+        public readonly HitErrorDisplay HitErrorDisplay;
         public readonly HoldForMenuButton HoldToQuit;
         public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
 
@@ -258,10 +259,7 @@ namespace osu.Game.Screens.Play
             Margin = new MarginPadding { Top = 20, Right = 10 },
         };
 
-        protected virtual HitErrorDisplay.HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay.HitErrorDisplay(scoreProcessor)
+        protected virtual HitErrorDisplay CreateHitErrorDisplayOverlay() => new HitErrorDisplay(scoreProcessor, drawableRuleset.Objects.First().HitWindows);
-        {
-            RelativeSizeAxes = Axes.Both,
-        };
 
         protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();