sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup and basic TestCase

Browse Source
This commit is contained in:
Dean Herbert
2017-12-13 19:56:16 +09:00
parent b9298325a3
commit 1b85952441
10 changed files with 193 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,20 +26,35 @@ namespace osu.Game.Screens.Select
{
public class BeatmapCarousel : OsuScrollContainer
{
/// <summary>
/// Triggered when the <see cref="Beatmaps"/> loaded change and are completely loaded.
/// </summary>
public Action BeatmapsChanged;
/// <summary>
/// The currently selected beatmap.
/// </summary>
public BeatmapInfo SelectedBeatmap => selectedBeatmap?.Beatmap;
public override bool HandleInput => AllowSelection;
/// <summary>
/// Raised when the <see cref="SelectedBeatmap"/> is changed.
/// </summary>
public Action<BeatmapInfo> SelectionChanged;
public Action BeatmapsChanged;
public override bool HandleInput => AllowSelection;
public IEnumerable<BeatmapSetInfo> Beatmaps
{
get { return carouselSets.Select(g => g.BeatmapSet); }
set
{
scrollableContent.Clear(false);
items.Clear();
carouselSets.Clear();
Schedule(() =>
{
scrollableContent.Clear(false);
items.Clear();
carouselSets.Clear();
yPositionsCache.Invalidate();
});
List<CarouselBeatmapSet> newSets = null;
@ -51,8 +66,7 @@ namespace osu.Game.Screens.Select
{
Schedule(() =>
{
foreach (var g in newSets)
addBeatmapSet(g);
carouselSets.AddRange(newSets);
root = new CarouselGroup(newSets.OfType<CarouselItem>().ToList());
items = root.Drawables.Value.ToList();
@ -94,7 +108,7 @@ namespace osu.Game.Screens.Select
});
}
public void RemoveBeatmap(BeatmapSetInfo beatmapSet)
public void RemoveBeatmapSet(BeatmapSetInfo beatmapSet)
{
Schedule(() => removeBeatmapSet(carouselSets.Find(b => b.BeatmapSet.ID == beatmapSet.ID)));
}
@ -116,8 +130,8 @@ namespace osu.Game.Screens.Select
{
if (index >= 0)
carouselSets.Insert(index, newSet);
else
addBeatmapSet(newSet);
//else
// addBeatmapSet(newSet);
}
if (hadSelection && newSet == null)
@ -158,8 +172,6 @@ namespace osu.Game.Screens.Select
}
}
public Action<BeatmapInfo> SelectionChanged;
private void selectNullBeatmap()
{
selectedBeatmap = null;
@ -180,7 +192,7 @@ namespace osu.Game.Screens.Select
return;
}
int originalIndex = Math.Max(0, items.IndexOf(selectedBeatmap?.Drawables.Value.First()));
int originalIndex = items.IndexOf(selectedBeatmap?.Drawables.Value.First());
int currentIndex = originalIndex;
// local function to increment the index in the required direction, wrapping over extremities.
@ -338,17 +350,6 @@ namespace osu.Game.Screens.Select
[BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuConfigManager config)
{
}
private void addBeatmapSet(CarouselBeatmapSet set)
{
// prevent duplicates by concurrent independent actions trying to add a group
//todo: check this
if (carouselSets.Any(g => g.BeatmapSet.ID == set.BeatmapSet.ID))
return;
//todo: add to root
carouselSets.Add(set);
randomSelectAlgorithm = config.GetBindable<RandomSelectAlgorithm>(OsuSetting.RandomSelectAlgorithm);
}
@ -422,7 +423,6 @@ namespace osu.Game.Screens.Select
private void select(CarouselItem item)
{
if (item == null) return;
item.State.Value = CarouselItemState.Selected;
}
@ -466,7 +466,7 @@ namespace osu.Game.Screens.Select
computeYPositions();
// Remove all items that should no longer be on-screen
scrollableContent.RemoveAll(delegate (DrawableCarouselItem p)
scrollableContent.RemoveAll(delegate(DrawableCarouselItem p)
{
float itemPosY = p.Position.Y;
bool remove = itemPosY < Current - p.DrawHeight || itemPosY > Current + drawHeight || !p.IsPresent;

7
osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs
View File

@ -52,11 +52,4 @@ namespace osu.Game.Screens.Select.Carousel
}*/
}
}
public enum CarouselItemState
{
Hidden,
NotSelected,
Selected,
}
}

7
osu.Game/Screens/Select/Carousel/CarouselItem.cs
View File

@ -54,4 +54,11 @@ namespace osu.Game.Screens.Select.Carousel
public virtual void Filter(FilterCriteria criteria) => Children?.ForEach(c => c.Filter(criteria));
}
public enum CarouselItemState
{
Hidden,
NotSelected,
Selected,
}
}

13
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmap.cs
View File

@ -35,12 +35,17 @@ namespace osu.Game.Screens.Select.Carousel
private readonly Triangles triangles;
private readonly StarCounter starCounter;
[BackgroundDependencyLoader]
[BackgroundDependencyLoader(true)]
private void load(SongSelect songSelect, BeatmapManager manager)
{
StartRequested = songSelect.Start;
EditRequested = songSelect.Edit;
HideRequested = manager.Hide;
if (songSelect != null)
{
StartRequested = songSelect.Start;
EditRequested = songSelect.Edit;
}
if (manager != null)
HideRequested = manager.Hide;
}
public DrawableCarouselBeatmap(CarouselBeatmap panel)

4
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -46,12 +46,10 @@ namespace osu.Game.Screens.Select.Carousel
RestoreHiddenRequested = s => s.Beatmaps.ForEach(manager.Restore);
DeleteRequested = manager.Delete;
var working = manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault());
Children = new Drawable[]
{
new DelayedLoadWrapper(
new PanelBackground(working)
new PanelBackground(manager.GetWorkingBeatmap(beatmapSet.Beatmaps.FirstOrDefault()))
{
RelativeSizeAxes = Axes.Both,
OnLoadComplete = d => d.FadeInFromZero(400, Easing.Out),

2
osu.Game/Screens/Select/Carousel/DrawableCarouselItem.cs
View File

@ -42,6 +42,8 @@ namespace osu.Game.Screens.Select.Carousel
Height = MAX_HEIGHT;
RelativeSizeAxes = Axes.X;
Alpha = 0;
AddInternal(borderContainer = new Container
{
RelativeSizeAxes = Axes.Both,

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -454,7 +454,7 @@ namespace osu.Game.Screens.Select
private void removeBeatmapSet(BeatmapSetInfo beatmapSet)
{
carousel.RemoveBeatmap(beatmapSet);
carousel.RemoveBeatmapSet(beatmapSet);
if (carousel.SelectedBeatmap == null)
Beatmap.SetDefault();
}