sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 07:06:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move HitErrorDisplay outside of the HUD

Browse Source
This commit is contained in:
Andrei Zavatski
2019-08-19 20:28:03 +03:00
parent f70a7abea3
commit 70084b5553
4 changed files with 90 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,6 @@ namespace osu.Game.Screens.Play
public readonly ModDisplay ModDisplay;
public readonly HoldForMenuButton HoldToQuit;
public readonly PlayerSettingsOverlay PlayerSettingsOverlay;
public readonly HitErrorDisplay LeftHitErrorDisplay;
public readonly HitErrorDisplay RightHitErrorDisplay;
public Bindable<bool> ShowHealthbar = new Bindable<bool>(true);
@ -87,8 +85,6 @@ namespace osu.Game.Screens.Play
HealthDisplay = CreateHealthDisplay(),
Progress = CreateProgress(),
ModDisplay = CreateModsContainer(),
LeftHitErrorDisplay = CreateHitErrorDisplay(false),
RightHitErrorDisplay = CreateHitErrorDisplay(),
}
},
PlayerSettingsOverlay = CreatePlayerSettingsOverlay(),
@ -261,13 +257,6 @@ namespace osu.Game.Screens.Play
Margin = new MarginPadding { Top = 20, Right = 10 },
};
protected virtual HitErrorDisplay CreateHitErrorDisplay(bool reversed = true) => new HitErrorDisplay(reversed)
{
Anchor = reversed ? Anchor.CentreRight : Anchor.CentreLeft,
Origin = reversed ? Anchor.CentreRight : Anchor.CentreLeft,
Margin = new MarginPadding { Horizontal = 20 }
};
protected virtual PlayerSettingsOverlay CreatePlayerSettingsOverlay() => new PlayerSettingsOverlay();
protected virtual void BindProcessor(ScoreProcessor processor)
@ -277,17 +266,6 @@ namespace osu.Game.Screens.Play
ComboCounter?.Current.BindTo(processor.Combo);
HealthDisplay?.Current.BindTo(processor.Health);
var hitWindows = processor.CreateHitWindows();
visibilityContainer.ForEach(drawable =>
{
if (drawable is HitErrorDisplay)
{
processor.NewJudgement += ((HitErrorDisplay)drawable).OnNewJudgement;
((HitErrorDisplay)drawable).HitWindows = hitWindows;
}
});
if (HealthDisplay is StandardHealthDisplay shd)
processor.NewJudgement += shd.Flash;
}