h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-18 05:42:56 +08:00
Code Issues Releases Wiki Activity

Move animation handling to Carousel implementation to better handle add/removes

Browse Source 
With the animation logic being external, it was going to make it very
hard to apply the scroll offset when a new panel is added or removed
before the current selection.

There's no real reason for the animations to be local to beatmap
carousel. If there's a usage in the future where the animation is to
change, we can add more customisation to `Carousel` itself.
This commit is contained in:
Dean Herbert 2025-01-15 17:01:07 +09:00
parent 0b764e6372
commit 6027947657
No known key found for this signature in database
4 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarouselV2.cs
View File

@ -168,7 +168,33 @@ namespace osu.Game.Tests.Visual.SongSelect
}
[Test]
public void TestScrollPositionVelocityMaintained()
public void TestScrollPositionMaintainedOnAddSecondSelected()
{
Quad positionBefore = default;
AddStep("add 10 beatmaps", () =>
{
for (int i = 0; i < 10; i++)
beatmapSets.Add(TestResources.CreateTestBeatmapSetInfo(RNG.Next(1, 4)));
});
AddUntilStep("visual item added", () => carousel.ChildrenOfType<BeatmapCarouselPanel>().Count(), () => Is.GreaterThan(0));
AddStep("select middle beatmap", () => carousel.CurrentSelection = beatmapSets.ElementAt(beatmapSets.Count - 2));
AddStep("scroll to selected item", () => scroll.ScrollTo(scroll.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Item!.Selected.Value)));
AddUntilStep("wait for scroll finished", () => scroll.Current, () => Is.EqualTo(scroll.Target));
AddStep("save selected screen position", () => positionBefore = carousel.ChildrenOfType<BeatmapCarouselPanel>().FirstOrDefault(p => p.Item!.Selected.Value)!.ScreenSpaceDrawQuad);
AddStep("remove first beatmap", () => beatmapSets.Remove(beatmapSets.Last()));
AddUntilStep("sorting finished", () => carousel.IsFiltering, () => Is.False);
AddAssert("select screen position unchanged", () => carousel.ChildrenOfType<BeatmapCarouselPanel>().Single(p => p.Item!.Selected.Value).ScreenSpaceDrawQuad,
() => Is.EqualTo(positionBefore));
}
[Test]
public void TestScrollPositionMaintainedOnAddLastSelected()
{
Quad positionBefore = default;

15
osu.Game/Screens/SelectV2/BeatmapCarouselPanel.cs
View File

@ -9,7 +9,6 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Pooling;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input.Events;
using osu.Framework.Utils;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Sprites;
using osuTK;
@ -98,18 +97,6 @@ namespace osu.Game.Screens.SelectV2
return true;
}
protected override void Update()
{
base.Update();
Debug.Assert(Item != null);
if (DrawYPosition != Item.CarouselYPosition)
{
DrawYPosition = Interpolation.DampContinuously(DrawYPosition, Item.CarouselYPosition, 50, Time.Elapsed);
}
}
public double DrawYPosition { get; private set; }
public double DrawYPosition { get; set; }
}
}

36
osu.Game/Screens/SelectV2/Carousel.cs
View File

@ -14,6 +14,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Pooling;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Logging;
using osu.Framework.Utils;
using osu.Game.Graphics.Containers;
using osuTK;
using osuTK.Graphics;
@ -107,7 +108,7 @@ namespace osu.Game.Screens.SelectV2
private List<CarouselItem>? displayedCarouselItems;
private readonly DoublePrecisionScroll scroll;
private readonly CarouselScrollContainer scroll;
protected Carousel()
{
@ -118,7 +119,7 @@ namespace osu.Game.Screens.SelectV2
Colour = Color4.Black,
RelativeSizeAxes = Axes.Both,
},
scroll = new DoublePrecisionScroll
scroll = new CarouselScrollContainer
{
RelativeSizeAxes = Axes.Both,
Masking = false,
@ -389,13 +390,13 @@ namespace osu.Game.Screens.SelectV2
/// Implementation of scroll container which handles very large vertical lists by internally using <c>double</c> precision
/// for pre-display Y values.
/// </summary>
private partial class DoublePrecisionScroll : OsuScrollContainer
private partial class CarouselScrollContainer : OsuScrollContainer
{
public readonly Container Panels;
public void SetLayoutHeight(float height) => Panels.Height = height;
public DoublePrecisionScroll()
public CarouselScrollContainer()
{
// Managing our own custom layout within ScrollContent causes feedback with public ScrollContainer calculations,
// so we must maintain one level of separation from ScrollContent.
@ -406,6 +407,33 @@ namespace osu.Game.Screens.SelectV2
});
}
public override void OffsetScrollPosition(double offset)
{
base.OffsetScrollPosition(offset);
foreach (var panel in Panels)
{
var c = (ICarouselPanel)panel;
Debug.Assert(c.Item != null);
c.DrawYPosition += offset;
}
}
protected override void Update()
{
base.Update();
foreach (var panel in Panels)
{
var c = (ICarouselPanel)panel;
Debug.Assert(c.Item != null);
if (c.DrawYPosition != c.Item.CarouselYPosition)
c.DrawYPosition = Interpolation.DampContinuously(c.DrawYPosition, c.Item.CarouselYPosition, 50, Time.Elapsed);
}
}
public override void Clear(bool disposeChildren)
{
Panels.Height = 0;

4
osu.Game/Screens/SelectV2/ICarouselPanel.cs
View File

@ -11,9 +11,9 @@ namespace osu.Game.Screens.SelectV2
public interface ICarouselPanel
{
/// <summary>
/// The Y position which should be used for displaying this item within the carousel.
/// The Y position which should be used for displaying this item within the carousel. This is managed by <see cref="Carousel{T}"/> and should not be set manually.
/// </summary>
double DrawYPosition { get; }
double DrawYPosition { get; set; }
/// <summary>
/// The carousel item this drawable is representing. This is managed by <see cref="Carousel{T}"/> and should not be set manually.