h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:52:57 +08:00
Code Issues Releases Wiki Activity

Update with further framework-side changes

Browse Source
This commit is contained in:
smoogipoo 2019-06-04 11:04:28 +09:00
parent 53a39e9142
commit cea353975f
7 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Tests/Visual/Editor/TestSceneWaveform.cs
View File

@ -21,13 +21,10 @@ namespace osu.Game.Tests.Visual.Editor
{
private WorkingBeatmap waveformBeatmap;
private OsuGameBase game;
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuGameBase game)
private void load(AudioManager audio)
{
waveformBeatmap = new WaveformTestBeatmap(audio);
this.game = game;
}
[TestCase(1f)]

2
osu.Game.Tests/Visual/UserInterface/TestSceneUpdateableBeatmapBackgroundSprite.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Tests.Visual.UserInterface
TestUpdateableBeatmapBackgroundSprite background = null;
AddStep("load null beatmap", () => Child = background = new TestUpdateableBeatmapBackgroundSprite { RelativeSizeAxes = Axes.Both });
AddUntilStep("wait for load", () => background.ContentLoaded);
AddAssert("no content", () => !background.ContentLoaded);
}
[Test]

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

@ -45,7 +45,7 @@ namespace osu.Game.Beatmaps
private TextureStore textureStore;
private IAdjustableResourceStore<Track> trackStore;
private ITrackStore trackStore;
protected override bool BackgroundStillValid(Texture b) => false; // bypass lazy logic. we want to return a new background each time for refcounting purposes.

21
osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
View File

@ -1,6 +1,7 @@
// 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;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -31,24 +32,8 @@ namespace osu.Game.Beatmaps.Drawables
/// </summary>
protected virtual double UnloadDelay => 10000;
private BeatmapInfo lastModel;
private bool firstLoad = true;
protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Drawable content, double timeBeforeLoad)
{
return new DelayedLoadUnloadWrapper(() =>
{
// If DelayedLoadUnloadWrapper is attempting to RELOAD the same content (Beatmap), that means that it was
// previously UNLOADED and thus its children have been disposed of, so we need to recreate them here.
if (!firstLoad && lastModel == Beatmap.Value)
return CreateDrawable(Beatmap.Value);
// If the model has changed since the previous unload (or if there was no load), then we can safely use the given content
lastModel = Beatmap.Value;
firstLoad = false;
return content;
}, timeBeforeLoad, UnloadDelay);
}
protected override DelayedLoadWrapper CreateDelayedLoadWrapper(Func<Drawable> createContentFunc, double timeBeforeLoad)
=> new DelayedLoadUnloadWrapper(createContentFunc, timeBeforeLoad, UnloadDelay);
protected override Drawable CreateDrawable(BeatmapInfo model)
{

4
osu.Game/Overlays/Changelog/UpdateStreamBadge.cs
View File

@ -90,8 +90,8 @@ namespace osu.Game.Overlays.Changelog
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleClick = audio.Sample.Get(@"UI/generic-select-soft");
sampleHover = audio.Sample.Get(@"UI/generic-hover-soft");
sampleClick = audio.Samples.Get(@"UI/generic-select-soft");
sampleHover = audio.Samples.Get(@"UI/generic-hover-soft");
}
protected override void OnActivated() => updateState();

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

@ -76,7 +76,7 @@ namespace osu.Game.Overlays
},
};
sampleBack = audio.Sample.Get(@"UI/generic-select-soft");
sampleBack = audio.Samples.Get(@"UI/generic-select-soft");
header.Current.BindTo(Current);

2
osu.Game/Screens/Multi/Match/Components/Header.cs
View File

@ -137,7 +137,7 @@ namespace osu.Game.Screens.Multi.Match.Components
private class BackgroundSprite : UpdateableBeatmapBackgroundSprite
{
protected override double FadeDuration => 200;
protected override double TransformDuration => 200;
}
}
}