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

Refactor IWorkingBeatmap.Background to GetBackground()

Browse Source
This commit is contained in:
Dean Herbert 2023-06-08 16:17:44 +09:00
parent 516633d978
commit a842f79ad4
19 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapEncoderTest.cs
View File

@ -231,7 +231,7 @@ namespace osu.Game.Tests.Beatmaps.Formats
protected override IBeatmap GetBeatmap() => beatmap; protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => throw new NotImplementedException(); public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException(); protected override Track GetBeatmapTrack() => throw new NotImplementedException();

2
osu.Game.Tests/Editing/Checks/CheckBackgroundQualityTest.cs
View File

@ -131,7 +131,7 @@ namespace osu.Game.Tests.Editing.Checks
var mock = new Mock<IWorkingBeatmap>(); var mock = new Mock<IWorkingBeatmap>();
mock.SetupGet(w => w.Beatmap).Returns(beatmap); mock.SetupGet(w => w.Beatmap).Returns(beatmap);
mock.SetupGet(w => w.Background).Returns(background); mock.SetupGet(w => w.GetBackground()).Returns(background);
mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream); mock.Setup(w => w.GetStream(It.IsAny<string>())).Returns(stream);
return mock; return mock;

2
osu.Game.Tests/Visual/Background/TestSceneBackgroundScreenDefault.cs
View File

@ -286,7 +286,7 @@ namespace osu.Game.Tests.Visual.Background
this.renderer = renderer; this.renderer = renderer;
} }
protected override Texture GetBackground() => renderer.CreateTexture(1, 1); public override Texture GetBackground() => renderer.CreateTexture(1, 1);
} }
private partial class TestWorkingBeatmapWithStoryboard : TestWorkingBeatmap private partial class TestWorkingBeatmapWithStoryboard : TestWorkingBeatmap

2
osu.Game.Tests/WaveformTestBeatmap.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Tests
protected override IBeatmap GetBeatmap() => beatmap; protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => null; public override Texture GetBackground() => null;
protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile)); protected override Waveform GetWaveform() => new Waveform(trackStore.GetStream(firstAudioFile));

5
osu.Game/Beatmaps/Drawables/BeatmapBackgroundSprite.cs
View File

@ -23,8 +23,9 @@ namespace osu.Game.Beatmaps.Drawables
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
if (working.Background != null) var background = working.GetBackground();
Texture = working.Background; if (background != null)
Texture = background;
} }
} }
} }

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

@ -52,7 +52,7 @@ namespace osu.Game.Beatmaps
protected override IBeatmap GetBeatmap() => new Beatmap(); protected override IBeatmap GetBeatmap() => new Beatmap();
protected override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4"); public override Texture GetBackground() => textures?.Get(@"Backgrounds/bg4");
protected override Track GetBeatmapTrack() => GetVirtualTrack(); protected override Track GetBeatmapTrack() => GetVirtualTrack();

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

@ -43,7 +43,7 @@ namespace osu.Game.Beatmaps
} }
protected override IBeatmap GetBeatmap() => beatmap; protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => throw new NotImplementedException(); public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException(); protected override Track GetBeatmapTrack() => throw new NotImplementedException();
protected internal override ISkin GetSkin() => throw new NotImplementedException(); protected internal override ISkin GetSkin() => throw new NotImplementedException();
public override Stream GetStream(string storagePath) => throw new NotImplementedException(); public override Stream GetStream(string storagePath) => throw new NotImplementedException();

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

@ -47,7 +47,7 @@ namespace osu.Game.Beatmaps
/// <summary> /// <summary>
/// Retrieves the background for this <see cref="IWorkingBeatmap"/>. /// Retrieves the background for this <see cref="IWorkingBeatmap"/>.
/// </summary> /// </summary>
Texture Background { get; } Texture GetBackground();
/// <summary> /// <summary>
/// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>. /// Retrieves the <see cref="Waveform"/> for the <see cref="Track"/> of this <see cref="IWorkingBeatmap"/>.

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

@ -34,8 +34,6 @@ namespace osu.Game.Beatmaps
public Storyboard Storyboard => storyboard.Value; public Storyboard Storyboard => storyboard.Value;
public Texture Background => GetBackground(); // Texture uses ref counting, so we want to return a new instance every usage.
public ISkin Skin => skin.Value; public ISkin Skin => skin.Value;
private AudioManager audioManager { get; } private AudioManager audioManager { get; }
@ -67,7 +65,7 @@ namespace osu.Game.Beatmaps
protected virtual Storyboard GetStoryboard() => new Storyboard { BeatmapInfo = BeatmapInfo }; protected virtual Storyboard GetStoryboard() => new Storyboard { BeatmapInfo = BeatmapInfo };
protected abstract IBeatmap GetBeatmap(); protected abstract IBeatmap GetBeatmap();
protected abstract Texture GetBackground(); public abstract Texture GetBackground();
protected abstract Track GetBeatmapTrack(); protected abstract Track GetBeatmapTrack();
/// <summary> /// <summary>

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

@ -160,7 +160,7 @@ namespace osu.Game.Beatmaps
} }
} }
protected override Texture GetBackground() public override Texture GetBackground()
{ {
if (string.IsNullOrEmpty(Metadata?.BackgroundFile)) if (string.IsNullOrEmpty(Metadata?.BackgroundFile))
return null; return null;

2
osu.Game/Graphics/Backgrounds/BeatmapBackground.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Graphics.Backgrounds
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(LargeTextureStore textures) private void load(LargeTextureStore textures)
{ {
Sprite.Texture = Beatmap?.Background ?? textures.Get(fallbackTextureName); Sprite.Texture = Beatmap?.GetBackground() ?? textures.Get(fallbackTextureName);
} }
public override bool Equals(Background other) public override bool Equals(Background other)

2
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -415,7 +415,7 @@ namespace osu.Game.Overlays
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(LargeTextureStore textures) private void load(LargeTextureStore textures)
{ {
sprite.Texture = beatmap?.Background ?? textures.Get(@"Backgrounds/bg4"); sprite.Texture = beatmap?.GetBackground() ?? textures.Get(@"Backgrounds/bg4");
} }
} }

2
osu.Game/Rulesets/Edit/Checks/CheckBackgroundQuality.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Edit.Checks
if (backgroundFile == null) if (backgroundFile == null)
yield break; yield break;
var texture = context.WorkingBeatmap.Background; var texture = context.WorkingBeatmap.GetBackground();
if (texture == null) if (texture == null)
yield break; yield break;

2
osu.Game/Screens/Edit/LegacyEditorBeatmapPatcher.cs
View File

@ -204,7 +204,7 @@ namespace osu.Game.Screens.Edit
protected override IBeatmap GetBeatmap() => beatmap; protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => throw new NotImplementedException(); public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException(); protected override Track GetBeatmapTrack() => throw new NotImplementedException();

2
osu.Game/Screens/OnlinePlay/Components/PlaylistItemBackground.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.OnlinePlay.Components
if (Beatmap?.BeatmapSet is IBeatmapSetOnlineInfo online) if (Beatmap?.BeatmapSet is IBeatmapSetOnlineInfo online)
texture = textures.Get(online.Covers.Cover); texture = textures.Get(online.Covers.Cover);
Sprite.Texture = texture ?? beatmaps.DefaultBeatmap.Background; Sprite.Texture = texture ?? beatmaps.DefaultBeatmap.GetBackground();
} }
public override bool Equals(Background? other) public override bool Equals(Background? other)

2
osu.Game/Screens/Play/BeatmapMetadataDisplay.cs
View File

@ -109,7 +109,7 @@ namespace osu.Game.Screens.Play
new Sprite new Sprite
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Texture = beatmap.Background, Texture = beatmap.GetBackground(),
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
FillMode = FillMode.Fill, FillMode = FillMode.Fill,

2
osu.Game/Screens/Play/HUD/PerformancePointsCounter.cs
View File

@ -226,7 +226,7 @@ namespace osu.Game.Screens.Play.HUD
protected override IBeatmap GetBeatmap() => gameplayBeatmap; protected override IBeatmap GetBeatmap() => gameplayBeatmap;
protected override Texture GetBackground() => throw new NotImplementedException(); public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException(); protected override Track GetBeatmapTrack() => throw new NotImplementedException();

2
osu.Game/Tests/Beatmaps/BeatmapConversionTest.cs
View File

@ -232,7 +232,7 @@ namespace osu.Game.Tests.Beatmaps
protected override IBeatmap GetBeatmap() => beatmap; protected override IBeatmap GetBeatmap() => beatmap;
protected override Texture GetBackground() => throw new NotImplementedException(); public override Texture GetBackground() => throw new NotImplementedException();
protected override Track GetBeatmapTrack() => throw new NotImplementedException(); protected override Track GetBeatmapTrack() => throw new NotImplementedException();

2
osu.Game/Tests/Beatmaps/TestWorkingBeatmap.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Tests.Beatmaps
public override Stream? GetStream(string storagePath) => null; public override Stream? GetStream(string storagePath) => null;
protected override Texture? GetBackground() => null; public override Texture? GetBackground() => null;
protected override Track? GetBeatmapTrack() => null; protected override Track? GetBeatmapTrack() => null;
} }