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

Make selection at random when last was null

Browse Source
This commit is contained in:
Endrik Tombak 2018-03-30 00:15:32 +03:00
parent 33b38b68cc
commit 3f65e3a7e3
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ namespace osu.Game.Screens.Select
get { return beatmapSets.Select(g => g.BeatmapSet); } get { return beatmapSets.Select(g => g.BeatmapSet); }
set set
{ {
CarouselGroup newRoot = new CarouselGroupEagerSelect(); CarouselGroup newRoot = new CarouselGroupEagerSelect(true);
Task.Run(() => Task.Run(() =>
{ {
@ -102,7 +102,7 @@ namespace osu.Game.Screens.Select
private readonly Stack<CarouselBeatmap> randomSelectedBeatmaps = new Stack<CarouselBeatmap>(); private readonly Stack<CarouselBeatmap> randomSelectedBeatmaps = new Stack<CarouselBeatmap>();
protected List<DrawableCarouselItem> Items = new List<DrawableCarouselItem>(); protected List<DrawableCarouselItem> Items = new List<DrawableCarouselItem>();
private CarouselGroup root = new CarouselGroupEagerSelect(); private CarouselGroup root = new CarouselGroupEagerSelect(true);
public BeatmapCarousel() public BeatmapCarousel()
{ {

23
osu.Game/Screens/Select/Carousel/CarouselGroupEagerSelect.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>. // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.MathUtils;
using System; using System;
using System.Linq; using System.Linq;
@ -11,8 +12,11 @@ namespace osu.Game.Screens.Select.Carousel
/// </summary> /// </summary>
public class CarouselGroupEagerSelect : CarouselGroup public class CarouselGroupEagerSelect : CarouselGroup
{ {
public CarouselGroupEagerSelect() private readonly bool isRootSelector;
public CarouselGroupEagerSelect(bool isRootSelector = false)
{ {
this.isRootSelector = isRootSelector;
State.ValueChanged += v => State.ValueChanged += v =>
{ {
if (v == CarouselItemState.Selected) if (v == CarouselItemState.Selected)
@ -83,9 +87,20 @@ namespace osu.Game.Screens.Select.Carousel
// we only perform eager selection if none of our children are in a selected state already. // we only perform eager selection if none of our children are in a selected state already.
if (Children.Any(i => i.State == CarouselItemState.Selected)) return; if (Children.Any(i => i.State == CarouselItemState.Selected)) return;
CarouselItem nextToSelect = CarouselItem nextToSelect = null;
Children.Skip(lastSelectedIndex).FirstOrDefault(i => !i.Filtered) ?? if (isRootSelector && lastSelected == null)
Children.Reverse().Skip(InternalChildren.Count - lastSelectedIndex).FirstOrDefault(i => !i.Filtered); {
var selectables = Children.Where(i => !i.Filtered).ToList();
if (selectables.Any())
nextToSelect = selectables[RNG.Next(selectables.Count)];
}
else
{
nextToSelect =
Children.Skip(lastSelectedIndex).FirstOrDefault(i => !i.Filtered) ??
Children.Reverse().Skip(InternalChildren.Count - lastSelectedIndex).FirstOrDefault(i => !i.Filtered);
}
if (nextToSelect != null) if (nextToSelect != null)
nextToSelect.State.Value = CarouselItemState.Selected; nextToSelect.State.Value = CarouselItemState.Selected;