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

Don't use drawables for select next

Browse Source
This commit is contained in:
Endrik Tombak 2020-03-28 12:54:48 +02:00
parent 96e1ab775e
commit fc3f9ff6fa
1 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -253,46 +253,35 @@ namespace osu.Game.Screens.Select
/// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param> /// <param name="skipDifficulties">Whether to skip individual difficulties and only increment over full groups.</param>
public void SelectNext(int direction = 1, bool skipDifficulties = true) public void SelectNext(int direction = 1, bool skipDifficulties = true)
{ {
var visibleItems = Items.Where(s => !s.Item.Filtered.Value).ToList(); if (!root.Children.Where(s => !s.Filtered.Value).ToList().Any())
if (!visibleItems.Any())
return; return;
DrawableCarouselItem drawable = null;
if (selectedBeatmap != null && (drawable = selectedBeatmap.Drawables.FirstOrDefault()) == null)
// if the selected beatmap isn't present yet, we can't correctly change selection.
// we can fix this by changing this method to not reference drawables / Items in the first place.
return;
int originalIndex = visibleItems.IndexOf(drawable);
int currentIndex = originalIndex;
// local function to increment the index in the required direction, wrapping over extremities.
int incrementIndex() => currentIndex = (currentIndex + direction + visibleItems.Count) % visibleItems.Count;
while (incrementIndex() != originalIndex)
{
var item = visibleItems[currentIndex].Item;
if (item.Filtered.Value || item.State.Value == CarouselItemState.Selected) continue;
switch (item)
{
case CarouselBeatmap beatmap:
if (skipDifficulties) continue;
select(beatmap);
return;
case CarouselBeatmapSet set:
if (skipDifficulties) if (skipDifficulties)
select(set); selectNextSet(direction, true);
else else
select(direction > 0 ? set.Beatmaps.First(b => !b.Filtered.Value) : set.Beatmaps.Last(b => !b.Filtered.Value)); selectNextDifficulty(direction);
return;
} }
private void selectNextSet(int direction, bool skipDifficulties)
{
var visibleSets = root.Children.OfType<CarouselBeatmapSet>().Where(s => !s.Filtered.Value).ToList();
var item = visibleSets[(visibleSets.IndexOf(selectedBeatmapSet) + direction + visibleSets.Count) % visibleSets.Count];
if (skipDifficulties)
select(item);
else
select(direction > 0 ? item.Beatmaps.First(b => !b.Filtered.Value) : item.Beatmaps.Last(b => !b.Filtered.Value));
} }
private void selectNextDifficulty(int direction)
{
var difficulties = selectedBeatmapSet.Children.Where(s => !s.Filtered.Value).ToList();
int index = difficulties.IndexOf(selectedBeatmap);
if (index + direction < 0 || index + direction >= difficulties.Count)
selectNextSet(direction, false);
else
select(difficulties[index + direction]);
} }
/// <summary> /// <summary>