RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split out `SceneLibrary` into its own component

This commit is contained in:
Dean Herbert 2022-03-07 19:23:57 +09:00
parent d062810ff2
commit 8d85723a62
1 changed files with 82 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
osu.Game/Skinning/Editor/SkinEditor.cs
View File

@ -6,8 +6,10 @@
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Screens; using osu.Framework.Screens;
@ -24,6 +26,7 @@
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using osu.Game.Screens.Select; using osu.Game.Screens.Select;
using osuTK; using osuTK;
using osuTK.Graphics;
namespace osu.Game.Skinning.Editor namespace osu.Game.Skinning.Editor
{ {
@ -48,12 +51,6 @@ public class SkinEditor : VisibilityContainer
[Resolved] [Resolved]
private OsuColour colours { get; set; } private OsuColour colours { get; set; }
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }
[Resolved(canBeNull: true)]
private OsuGame game { get; set; }
private bool hasBegunMutating; private bool hasBegunMutating;
private Container content; private Container content;
@ -117,47 +114,12 @@ private void load()
}, },
}, },
}, },
new FillFlowContainer new SceneLibrary
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Y = 45, Y = 45,
Height = 30,
Name = "Scene library",
Spacing = new Vector2(10),
Padding = new MarginPadding(10),
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
new PurpleTriangleButton
{
Text = "Song Select",
Width = 100,
Height = 30,
Action = () => game?.PerformFromScreen(screen =>
{
if (screen is SongSelect)
return;
screen.Push(new PlaySongSelect());
}, new[] { typeof(SongSelect) })
},
new PurpleTriangleButton
{
Text = "Gameplay",
Width = 100,
Height = 30,
Action = () => game?.PerformFromScreen(screen =>
{
if (screen is Player)
return;
var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
if (replayGeneratingMod != null)
screen.Push(new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateReplayScore(beatmap, mods)));
}, new[] { typeof(Player) })
},
}
}, },
new GridContainer new GridContainer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -226,7 +188,10 @@ void loadBlueprintContainer()
{ {
content.Children = new Drawable[] content.Children = new Drawable[]
{ {
new SkinBlueprintContainer(targetScreen), new SkinBlueprintContainer(targetScreen)
{
Margin = new MarginPadding { Top = 100 },
}
}; };
} }
} }
@ -345,5 +310,78 @@ public void DeleteItems(ISkinnableDrawable[] items)
foreach (var item in items) foreach (var item in items)
availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item); availableTargets.FirstOrDefault(t => t.Components.Contains(item))?.Remove(item);
} }
private class SceneLibrary : CompositeDrawable
{
public const float HEIGHT = 30;
private const float padding = 10;
[Resolved(canBeNull: true)]
private OsuGame game { get; set; }
[Resolved]
private IBindable<RulesetInfo> ruleset { get; set; }
[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new Drawable[]
{
new OsuScrollContainer(Direction.Horizontal)
{
RelativeSizeAxes = Axes.X,
Height = HEIGHT + padding * 2,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.Black.Opacity(0.5f)
},
new FillFlowContainer
{
Name = "Scene library",
AutoSizeAxes = Axes.X,
RelativeSizeAxes = Axes.Y,
Spacing = new Vector2(padding),
Padding = new MarginPadding(padding),
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
new PurpleTriangleButton
{
Text = "Song Select",
Width = 100,
Height = HEIGHT,
Action = () => game?.PerformFromScreen(screen =>
{
if (screen is SongSelect)
return;
screen.Push(new PlaySongSelect());
}, new[] { typeof(SongSelect) })
},
new PurpleTriangleButton
{
Text = "Gameplay",
Width = 100,
Height = HEIGHT,
Action = () => game?.PerformFromScreen(screen =>
{
if (screen is Player)
return;
var replayGeneratingMod = ruleset.Value.CreateInstance().GetAutoplayMod();
if (replayGeneratingMod != null)
screen.Push(new ReplayPlayer((beatmap, mods) => replayGeneratingMod.CreateReplayScore(beatmap, mods)));
}, new[] { typeof(Player), typeof(SongSelect) })
},
}
},
}
}
};
}
}
} }
} }