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

Make GameBeatmap late-bind its AudioManager for ctor Beatmap access

Browse Source
This commit is contained in:
smoogipoo
2018-05-28 17:55:41 +09:00
parent 7961c56239
commit 3a5228af43
3 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game/OsuGameBase.cs
View File

@ -64,7 +64,8 @@ namespace osu.Game
protected override Container<Drawable> Content => content;
protected GameBeatmap Beatmap;
private OsuGameBeatmap beatmap;
protected GameBeatmap Beatmap => beatmap;
private Bindable<bool> fpsDisplayVisible;
@ -156,15 +157,15 @@ namespace osu.Game
Fonts.AddStore(new GlyphStore(Resources, @"Fonts/Venera-Light"));
var defaultBeatmap = new DummyWorkingBeatmap(this);
Beatmap = new GameBeatmap(defaultBeatmap, Audio);
beatmap = new OsuGameBeatmap(defaultBeatmap, Audio);
BeatmapManager.DefaultBeatmap = defaultBeatmap;
// tracks play so loud our samples can't keep up.
// this adds a global reduction of track volume for the time being.
Audio.Track.AddAdjustment(AdjustableProperty.Volume, new BindableDouble(0.8));
dependencies.Cache(Beatmap);
dependencies.CacheAs<IGameBeatmap>(Beatmap);
dependencies.CacheAs<GameBeatmap>(beatmap);
dependencies.CacheAs<IGameBeatmap>(beatmap);
FileStore.Cleanup();
@ -235,5 +236,26 @@ namespace osu.Game
}
public string[] HandledExtensions => fileImporters.SelectMany(i => i.HandledExtensions).ToArray();
private class OsuGameBeatmap : GameBeatmap
{
public OsuGameBeatmap(WorkingBeatmap defaultValue, AudioManager audioManager)
: this(defaultValue)
{
RegisterAudioManager(audioManager);
}
private OsuGameBeatmap(WorkingBeatmap defaultValue)
: base(defaultValue)
{
}
public override GameBeatmap GetBoundCopy()
{
var copy = new OsuGameBeatmap(Default);
copy.BindTo(this);
return copy;
}
}
}
}