Add support for ruleset-specific blueprints in editor timeline

osu.Game.Rulesets.Mania/Edit/ManiaTimelineBlueprintContainer.cs

@@ -0,0 +1,22 @@
+// 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 osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+
+namespace osu.Game.Rulesets.Mania.Edit
+{
+    public partial class ManiaTimelineBlueprintContainer : TimelineBlueprintContainer
+    {
+        public ManiaTimelineBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
+        {
+        }
+
+        public override TimelineHitObjectBlueprint? CreateTimelineBlueprintFor(HitObject hitObject)
+        {
+            return null;
+        }
+    }
+}

osu.Game.Rulesets.Mania/ManiaRuleset.cs

@@ -35,6 +35,7 @@
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
@@ -64,6 +65,8 @@ public class ManiaRuleset : Ruleset, ILegacyRuleset
 
         public override HitObjectComposer CreateHitObjectComposer() => new ManiaHitObjectComposer(this);
 
+        public override TimelineBlueprintContainer CreateTimelineBlueprintContainer(HitObjectComposer composer) => new ManiaTimelineBlueprintContainer(composer);
+
         public override IBeatmapVerifier CreateBeatmapVerifier() => new ManiaBeatmapVerifier();
 
         public override ISkin? CreateSkinTransformer(ISkin skin, IBeatmap beatmap)

osu.Game.Rulesets.Osu/Edit/Blueprints/Spinners/SpinnerTimelineBlueprint.cs

@@ -0,0 +1,17 @@
+// 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 osu.Game.Rulesets.Objects;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+
+namespace osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners
+{
+    public partial class SpinnerTimelineBlueprint : TimelineHitObjectBlueprint
+    {
+        public SpinnerTimelineBlueprint(HitObject item)
+            : base(item)
+        {
+            SamplePointPiece.X = 1;
+        }
+    }
+}

osu.Game.Rulesets.Osu/Edit/OsuTimelineBlueprintContainer.cs

@@ -0,0 +1,30 @@
+// 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 osu.Game.Rulesets.Edit;
+using osu.Game.Rulesets.Objects;
+using osu.Game.Rulesets.Osu.Edit.Blueprints.Spinners;
+using osu.Game.Rulesets.Osu.Objects;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
+
+namespace osu.Game.Rulesets.Osu.Edit
+{
+    public partial class OsuTimelineBlueprintContainer : TimelineBlueprintContainer
+    {
+        public OsuTimelineBlueprintContainer(HitObjectComposer composer)
+            : base(composer)
+        {
+        }
+
+        public override TimelineHitObjectBlueprint? CreateTimelineBlueprintFor(HitObject hitObject)
+        {
+            switch (hitObject)
+            {
+                case Spinner spinner:
+                    return new SpinnerTimelineBlueprint(spinner);
+            }
+
+            return base.CreateTimelineBlueprintFor(hitObject);
+        }
+    }
+}

osu.Game.Rulesets.Osu/OsuRuleset.cs

@@ -36,6 +36,7 @@
 using osu.Game.Rulesets.Scoring.Legacy;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
@@ -235,6 +236,8 @@ public override IEnumerable<Mod> GetModsFor(ModType type)
 
         public override HitObjectComposer CreateHitObjectComposer() => new OsuHitObjectComposer(this);
 
+        public override TimelineBlueprintContainer CreateTimelineBlueprintContainer(HitObjectComposer composer) => new OsuTimelineBlueprintContainer(composer);
+
         public override IBeatmapVerifier CreateBeatmapVerifier() => new OsuBeatmapVerifier();
 
         public override string Description => "osu!";

osu.Game/Rulesets/Ruleset.cs

@@ -26,6 +26,7 @@
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.UI;
 using osu.Game.Scoring;
+using osu.Game.Screens.Edit.Compose.Components.Timeline;
 using osu.Game.Screens.Edit.Setup;
 using osu.Game.Screens.Ranking.Statistics;
 using osu.Game.Skinning;
@@ -270,6 +271,8 @@ protected Ruleset()
 
         public virtual HitObjectComposer? CreateHitObjectComposer() => null;
 
+        public virtual TimelineBlueprintContainer CreateTimelineBlueprintContainer(HitObjectComposer composer) => new TimelineBlueprintContainer(composer);
+
         public virtual IBeatmapVerifier? CreateBeatmapVerifier() => null;
 
         public virtual Drawable CreateIcon() => new SpriteIcon { Icon = FontAwesome.Solid.QuestionCircle };

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineBlueprintContainer.cs

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using JetBrains.Annotations;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Extensions.Color4Extensions;
@@ -25,7 +26,7 @@
 
 namespace osu.Game.Screens.Edit.Compose.Components.Timeline
 {
-    internal partial class TimelineBlueprintContainer : EditorBlueprintContainer
+    public partial class TimelineBlueprintContainer : EditorBlueprintContainer
     {
         [Resolved(CanBeNull = true)]
         private Timeline timeline { get; set; }
@@ -84,7 +85,7 @@
             {
                 placementBlueprint = CreateBlueprintFor(obj.NewValue).AsNonNull();
 
                 placementBlueprint.Colour = OsuColour.Gray(0.9f);
 
                 // TODO: this is out of order, causing incorrect stacking height.
                 SelectionBlueprints.Add(placementBlueprint);
@@ -163,14 +164,14 @@
 
         protected override SelectionHandler<HitObject> CreateSelectionHandler() => new TimelineSelectionHandler();
 
-        protected override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
+        protected sealed override SelectionBlueprint<HitObject> CreateBlueprintFor(HitObject item)
         {
-            return new TimelineHitObjectBlueprint(item)
-            {
-                OnDragHandled = e => hitObjectDragged = e != null,
-            };
+            return CreateTimelineBlueprintFor(item)?.With(b => b.OnDragHandled = e => hitObjectDragged = e != null);
         }
 
+        [CanBeNull]
+        public virtual TimelineHitObjectBlueprint CreateTimelineBlueprintFor(HitObject hitObject) => new TimelineHitObjectBlueprint(hitObject);
+
         protected sealed override DragBox CreateDragBox() => new TimelineDragBox();
 
         protected override void UpdateSelectionFromDragBox()

osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineHitObjectBlueprint.cs

@@ -52,7 +52,7 @@ public partial class TimelineHitObjectBlueprint : SelectionBlueprint<HitObject>
         private readonly Container colouredComponents;
         private readonly Container sampleComponents;
         private readonly OsuSpriteText comboIndexText;
-        private readonly SamplePointPiece samplePointPiece;
+        protected readonly SamplePointPiece SamplePointPiece;
         private readonly DifficultyPointPiece? difficultyPointPiece;
 
         [Resolved]
@@ -105,7 +105,7 @@ public TimelineHitObjectBlueprint(HitObject item)
                         },
                     }
                 },
-                samplePointPiece = new SamplePointPiece(Item)
+                SamplePointPiece = new SamplePointPiece(Item)
                 {
                     Anchor = Anchor.BottomLeft,
                     Origin = Anchor.TopCentre,
@@ -258,7 +258,7 @@ private void updateRepeats(IHasRepeats repeats)
                 });
             }
 
-            samplePointPiece.X = 1f / (repeats.RepeatCount + 1) / 2;
+            SamplePointPiece.X = 1f / (repeats.RepeatCount + 1) / 2;
         }
 
         protected override bool ShouldBeConsideredForInput(Drawable child) => true;
@@ -281,7 +281,7 @@ protected override bool ComputeIsMaskedAway(RectangleF maskingBounds)
             // If the component is considered masked away, we'll use children to create an extended quad that encapsulates all parts of this blueprint
             // to ensure it doesn't pop in and out of existence abruptly when scrolling the timeline.
             var rect = RectangleF.Union(ScreenSpaceDrawQuad.AABBFloat, circle.ScreenSpaceDrawQuad.AABBFloat);
-            rect = RectangleF.Union(rect, samplePointPiece.ScreenSpaceDrawQuad.AABBFloat);
+            rect = RectangleF.Union(rect, SamplePointPiece.ScreenSpaceDrawQuad.AABBFloat);
 
             if (difficultyPointPiece != null)
                 rect = RectangleF.Union(rect, difficultyPointPiece.ScreenSpaceDrawQuad.AABBFloat);

osu.Game/Screens/Edit/Compose/ComposeScreen.cs

@@ -85,7 +85,7 @@ protected override Drawable CreateTimelineContent()
                     // We want to display this below hitobjects to better expose placement objects visually.
                     // It needs to be above the blueprint container to handle drags on breaks though.
                     breakDisplay.CreateProxy(),
-                    new TimelineBlueprintContainer(composer),
+                    ruleset.CreateTimelineBlueprintContainer(composer),
                     breakDisplay
                 }
             });