Move classes to local namespaces

Also renames test scene to more appropriate name.
This commit is contained in:
Dean Herbert
2019-07-12 11:50:06 +09:00
parent b5ca7faca4
commit 46f7bb885b
5 changed files with 90 additions and 98 deletions

View File

@ -76,9 +76,9 @@ namespace osu.Game.Screens.Play
protected GameplayClockContainer GameplayClockContainer { get; private set; }
protected DimmableStoryboardContainer DimmableStoryboardContainer { get; private set; }
protected DimmableStoryboard DimmableStoryboard { get; private set; }
protected virtual DimmableStoryboardContainer CreateStoryboardContainer(Storyboard storyboard) => new DimmableStoryboardContainer(storyboard) { RelativeSizeAxes = Axes.Both };
protected virtual DimmableStoryboard CreateStoryboardContainer(Storyboard storyboard) => new DimmableStoryboard(storyboard) { RelativeSizeAxes = Axes.Both };
[Cached]
[Cached(Type = typeof(IBindable<IReadOnlyList<Mod>>))]
@ -124,7 +124,7 @@ namespace osu.Game.Screens.Play
GameplayClockContainer.Children = new[]
{
DimmableStoryboardContainer = CreateStoryboardContainer(Beatmap.Value.Storyboard),
DimmableStoryboard = CreateStoryboardContainer(Beatmap.Value.Storyboard),
new ScalingContainer(ScalingMode.Gameplay)
{
Child = new LocalSkinOverrideContainer(working.Skin)
@ -455,7 +455,7 @@ namespace osu.Game.Screens.Play
Background.BlurAmount.Value = 0;
Background.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
DimmableStoryboardContainer.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
DimmableStoryboard.StoryboardReplacesBackground.BindTo(storyboardReplacesBackground);
storyboardReplacesBackground.Value = Beatmap.Value.Storyboard.ReplacesBackground && Beatmap.Value.Storyboard.HasDrawable;