sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Apply naming suggestions

Browse Source
This commit is contained in:
Andrei Zavatski
2019-08-31 16:20:33 +03:00
parent d2f7a653a8
commit 94512fea8e
6 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/IWorkingBeatmap.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Beatmaps
Texture Background { get; } Texture Background { get; }
/// <summary> /// <summary>
/// Retrieves the video file for this <see cref="WorkingBeatmap"/>. /// Retrieves the video background file for this <see cref="WorkingBeatmap"/>.
/// </summary> /// </summary>
VideoSprite Video { get; } VideoSprite Video { get; }

1
osu.Game/Beatmaps/WorkingBeatmap.cs
View File

@ -185,7 +185,6 @@ namespace osu.Game.Beatmaps
public bool BackgroundLoaded => background.IsResultAvailable; public bool BackgroundLoaded => background.IsResultAvailable;
public Texture Background => background.Value; public Texture Background => background.Value;
protected virtual bool BackgroundStillValid(Texture b) => b == null || b.Available; protected virtual bool BackgroundStillValid(Texture b) => b == null || b.Available;
protected abstract Texture GetBackground(); protected abstract Texture GetBackground();
private readonly RecyclableLazy<Texture> background; private readonly RecyclableLazy<Texture> background;

4
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -69,7 +69,7 @@ namespace osu.Game.Configuration
Set(OsuSetting.ShowFpsDisplay, false); Set(OsuSetting.ShowFpsDisplay, false);
Set(OsuSetting.ShowStoryboard, true); Set(OsuSetting.ShowStoryboard, true);
Set(OsuSetting.ShowVideo, true); Set(OsuSetting.ShowVideoBackground, true);
Set(OsuSetting.BeatmapSkins, true); Set(OsuSetting.BeatmapSkins, true);
Set(OsuSetting.BeatmapHitsounds, true); Set(OsuSetting.BeatmapHitsounds, true);
@ -137,7 +137,7 @@ namespace osu.Game.Configuration
DimLevel, DimLevel,
BlurLevel, BlurLevel,
ShowStoryboard, ShowStoryboard,
ShowVideo, ShowVideoBackground,
KeyOverlay, KeyOverlay,
ScoreMeter, ScoreMeter,
FloatingComments, FloatingComments,

2
osu.Game/Graphics/Containers/UserDimContainer.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
{ {
UserDimLevel = config.GetBindable<double>(OsuSetting.DimLevel); UserDimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard); ShowStoryboard = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
ShowVideo = config.GetBindable<bool>(OsuSetting.ShowVideo); ShowVideo = config.GetBindable<bool>(OsuSetting.ShowVideoBackground);
EnableUserDim.ValueChanged += _ => UpdateVisuals(); EnableUserDim.ValueChanged += _ => UpdateVisuals();
UserDimLevel.ValueChanged += _ => UpdateVisuals(); UserDimLevel.ValueChanged += _ => UpdateVisuals();

2
osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
new SettingsCheckbox new SettingsCheckbox
{ {
LabelText = "Video", LabelText = "Video",
Bindable = config.GetBindable<bool>(OsuSetting.ShowVideo) Bindable = config.GetBindable<bool>(OsuSetting.ShowVideoBackground)
}, },
new SettingsCheckbox new SettingsCheckbox
{ {

2
osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
View File

@ -50,7 +50,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel); dimSliderBar.Bindable = config.GetBindable<double>(OsuSetting.DimLevel);
blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel); blurSliderBar.Bindable = config.GetBindable<double>(OsuSetting.BlurLevel);
showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard); showStoryboardToggle.Current = config.GetBindable<bool>(OsuSetting.ShowStoryboard);
showVideoToggle.Current = config.GetBindable<bool>(OsuSetting.ShowVideo); showVideoToggle.Current = config.GetBindable<bool>(OsuSetting.ShowVideoBackground);
beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins); beatmapSkinsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapSkins);
beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds); beatmapHitsoundsToggle.Current = config.GetBindable<bool>(OsuSetting.BeatmapHitsounds);
} }