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

Make work in editor

Browse Source
This commit is contained in:
Dean Herbert
2019-12-05 20:12:25 +09:00
parent e225b0032a
commit d8620a70fb
8 changed files with 53 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
osu.Game/Screens/Edit/Compose/ComposeScreen.cs
View File

@ -3,17 +3,21 @@
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Edit;
using osu.Game.Screens.Edit.Compose.Components.Timeline;
using osu.Game.Skinning;
namespace osu.Game.Screens.Edit.Compose
{
public class ComposeScreen : EditorScreenWithTimeline
{
private HitObjectComposer composer;
protected override Drawable CreateMainContent()
{
var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
var composer = ruleset?.CreateHitObjectComposer();
composer = ruleset?.CreateHitObjectComposer();
if (composer != null)
{
@ -25,10 +29,15 @@ namespace osu.Game.Screens.Edit.Compose
// load the skinning hierarchy first.
// this is intentionally done in two stages to ensure things are in a loaded state before exposing the ruleset to skin sources.
return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(ruleset.CreateHitObjectComposer()));
return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(composer));
}
return new ScreenWhiteBox.UnderConstructionMessage(ruleset == null ? "This beatmap" : $"{ruleset.Description}'s composer");
}
protected override Drawable CreateTimelineContent() => new TimelineHitObjectDisplay(composer.EditorBeatmap)
{
RelativeSizeAxes = Axes.Both,
};
}
}