h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-22 00:43:25 +08:00
Code Issues Releases Wiki Activity

Update MultiplayerQueueList to take advantage of GameplayOrder

Browse Source
This commit is contained in:
Dan Balasescu 2021-12-02 21:13:20 +09:00
parent ba8af303cc
commit 9760a2b087
1 changed files with 2 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
osu.Game/Screens/OnlinePlay/Multiplayer/Match/Playlist/MultiplayerQueueList.cs
View File

@ -1,14 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Containers;
using osu.Game.Online.Multiplayer;
using osu.Game.Online.Rooms; using osu.Game.Online.Rooms;
using osuTK; using osuTK;
@ -31,74 +29,16 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match.Playlist
private class QueueFillFlowContainer : FillFlowContainer<RearrangeableListItem<PlaylistItem>> private class QueueFillFlowContainer : FillFlowContainer<RearrangeableListItem<PlaylistItem>>
{ {
[Resolved(typeof(Room), nameof(Room.QueueMode))]
private Bindable<QueueMode> queueMode { get; set; }
[Resolved(typeof(Room), nameof(Room.Playlist))] [Resolved(typeof(Room), nameof(Room.Playlist))]
private BindableList<PlaylistItem> roomPlaylist { get; set; } private BindableList<PlaylistItem> roomPlaylist { get; set; }
protected override void LoadComplete() protected override void LoadComplete()
{ {
base.LoadComplete(); base.LoadComplete();
queueMode.BindValueChanged(_ => InvalidateLayout()); roomPlaylist.BindCollectionChanged((_, __) => InvalidateLayout());
} }
public override IEnumerable<Drawable> FlowingChildren public override IEnumerable<Drawable> FlowingChildren => base.FlowingChildren.OfType<RearrangeableListItem<PlaylistItem>>().OrderBy(item => item.Model.GameplayOrder);
{
get
{
switch (queueMode.Value)
{
default:
return AliveInternalChildren.Where(d => d.IsPresent)
.OfType<RearrangeableListItem<PlaylistItem>>()
.OrderBy(item => item.Model.ID);
case QueueMode.AllPlayersRoundRobin:
RearrangeableListItem<PlaylistItem>[] items = AliveInternalChildren
.Where(d => d.IsPresent)
.OfType<RearrangeableListItem<PlaylistItem>>()
.OrderBy(item => item.Model.ID)
.ToArray();
int totalCount = items.Length;
if (totalCount == 0)
return Enumerable.Empty<Drawable>();
// Count of "expired" items per user.
Dictionary<int, int> perUserCounts = roomPlaylist
.Where(item => item.Expired)
.GroupBy(item => item.OwnerID)
.ToDictionary(group => group.Key, group => group.Count());
// Fill the count dictionary with zeroes for all users with no currently expired items.
foreach (var item in items)
perUserCounts.TryAdd(item.Model.OwnerID, 0);
List<Drawable> result = new List<Drawable>();
// Run a simulation...
// In every iteration, pick the first available item from the user with the lowest number of items in the queue to add to the result set.
// If multiple users have the same number of items in the queue, then the item with the lowest ID is chosen.
// Todo: This could probably be more efficient, likely at the cost of increased complexity.
while (totalCount-- > 0)
{
var candidateItem = items
.Where(item => item != null)
.OrderBy(item => perUserCounts[item.Model.OwnerID])
.First();
int itemIndex = Array.IndexOf(items, candidateItem);
result.Add(items[itemIndex]);
perUserCounts[candidateItem.Model.OwnerID]++;
items[itemIndex] = null;
}
return result;
}
}
}
} }
} }
} }