mirror of
https://github.com/ppy/osu.git
synced 2024-12-14 13:22:55 +08:00
Merge pull request #12350 from smoogipoo/multiplayer-spectator-player-grid
Add the multiplayer spectator player grid
This commit is contained in:
Dean Herbert
GitHub
commit
2884ed3ab9
@ -0,0 +1,115 @@
|
||||
// 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.
|
||||
|
||||
using System.Linq;
|
||||
using NUnit.Framework;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Shapes;
|
||||
using osu.Framework.Utils;
|
||||
using osu.Game.Screens.OnlinePlay.Multiplayer.Spectate;
|
||||
using osuTK.Graphics;
|
||||
using osuTK.Input;
|
||||
|
||||
namespace osu.Game.Tests.Visual.Multiplayer
|
||||
{
|
||||
public class TestSceneMultiplayerSpectatorPlayerGrid : OsuManualInputManagerTestScene
|
||||
{
|
||||
private PlayerGrid grid;
|
||||
|
||||
[SetUp]
|
||||
public void Setup() => Schedule(() =>
|
||||
{
|
||||
Child = grid = new PlayerGrid { RelativeSizeAxes = Axes.Both };
|
||||
});
|
||||
|
||||
[Test]
|
||||
public void TestMaximiseAndMinimise()
|
||||
{
|
||||
addCells(2);
|
||||
|
||||
assertMaximisation(0, false, true);
|
||||
assertMaximisation(1, false, true);
|
||||
|
||||
clickCell(0);
|
||||
assertMaximisation(0, true);
|
||||
assertMaximisation(1, false, true);
|
||||
clickCell(0);
|
||||
assertMaximisation(0, false);
|
||||
assertMaximisation(1, false, true);
|
||||
|
||||
clickCell(1);
|
||||
assertMaximisation(1, true);
|
||||
assertMaximisation(0, false, true);
|
||||
clickCell(1);
|
||||
assertMaximisation(1, false);
|
||||
assertMaximisation(0, false, true);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestClickBothCellsSimultaneously()
|
||||
{
|
||||
addCells(2);
|
||||
|
||||
AddStep("click cell 0 then 1", () =>
|
||||
{
|
||||
InputManager.MoveMouseTo(grid.Content.ElementAt(0));
|
||||
InputManager.Click(MouseButton.Left);
|
||||
|
||||
InputManager.MoveMouseTo(grid.Content.ElementAt(1));
|
||||
InputManager.Click(MouseButton.Left);
|
||||
});
|
||||
|
||||
assertMaximisation(1, true);
|
||||
assertMaximisation(0, false);
|
||||
}
|
||||
|
||||
[TestCase(1)]
|
||||
[TestCase(2)]
|
||||
[TestCase(3)]
|
||||
[TestCase(4)]
|
||||
[TestCase(5)]
|
||||
[TestCase(9)]
|
||||
[TestCase(11)]
|
||||
[TestCase(12)]
|
||||
[TestCase(15)]
|
||||
[TestCase(16)]
|
||||
public void TestCellCount(int count)
|
||||
{
|
||||
addCells(count);
|
||||
AddWaitStep("wait for display", 2);
|
||||
}
|
||||
|
||||
private void addCells(int count) => AddStep($"add {count} grid cells", () =>
|
||||
{
|
||||
for (int i = 0; i < count; i++)
|
||||
grid.Add(new GridContent());
|
||||
});
|
||||
|
||||
private void clickCell(int index) => AddStep($"click cell index {index}", () =>
|
||||
{
|
||||
InputManager.MoveMouseTo(grid.Content.ElementAt(index));
|
||||
InputManager.Click(MouseButton.Left);
|
||||
});
|
||||
|
||||
private void assertMaximisation(int index, bool shouldBeMaximised, bool instant = false)
|
||||
{
|
||||
string assertionText = $"cell index {index} {(shouldBeMaximised ? "is" : "is not")} maximised";
|
||||
|
||||
if (instant)
|
||||
AddAssert(assertionText, checkAction);
|
||||
else
|
||||
AddUntilStep(assertionText, checkAction);
|
||||
|
||||
bool checkAction() => Precision.AlmostEquals(grid.MaximisedFacade.DrawSize, grid.Content.ElementAt(index).DrawSize, 10) == shouldBeMaximised;
|
||||
}
|
||||
|
||||
private class GridContent : Box
|
||||
{
|
||||
public GridContent()
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both;
|
||||
Colour = new Color4(RNG.NextSingle(), RNG.NextSingle(), RNG.NextSingle(), 1f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
167
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
Normal file
167
osu.Game/Screens/OnlinePlay/Multiplayer/Spectate/PlayerGrid.cs
Normal file
@ -0,0 +1,167 @@
|
||||
// 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.
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osuTK;
|
||||
|
||||
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
|
||||
{
|
||||
/// <summary>
|
||||
/// A grid of players playing the multiplayer match.
|
||||
/// </summary>
|
||||
public partial class PlayerGrid : CompositeDrawable
|
||||
{
|
||||
private const float player_spacing = 5;
|
||||
|
||||
/// <summary>
|
||||
/// The currently-maximised facade.
|
||||
/// </summary>
|
||||
public Drawable MaximisedFacade => maximisedFacade;
|
||||
|
||||
private readonly Facade maximisedFacade;
|
||||
private readonly Container paddingContainer;
|
||||
private readonly FillFlowContainer<Facade> facadeContainer;
|
||||
private readonly Container<Cell> cellContainer;
|
||||
|
||||
public PlayerGrid()
|
||||
{
|
||||
InternalChildren = new Drawable[]
|
||||
{
|
||||
paddingContainer = new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Padding = new MarginPadding(player_spacing),
|
||||
Children = new Drawable[]
|
||||
{
|
||||
new Container
|
||||
{
|
||||
RelativeSizeAxes = Axes.Both,
|
||||
Child = facadeContainer = new FillFlowContainer<Facade>
|
||||
{
|
||||
RelativeSizeAxes = Axes.X,
|
||||
AutoSizeAxes = Axes.Y,
|
||||
Spacing = new Vector2(player_spacing),
|
||||
}
|
||||
},
|
||||
maximisedFacade = new Facade { RelativeSizeAxes = Axes.Both }
|
||||
}
|
||||
},
|
||||
cellContainer = new Container<Cell> { RelativeSizeAxes = Axes.Both }
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Adds a new cell with content to this grid.
|
||||
/// </summary>
|
||||
/// <param name="content">The content the cell should contain.</param>
|
||||
/// <exception cref="InvalidOperationException">If more than 16 cells are added.</exception>
|
||||
public void Add(Drawable content)
|
||||
{
|
||||
if (cellContainer.Count == 16)
|
||||
throw new InvalidOperationException("Only 16 cells are supported.");
|
||||
|
||||
int index = cellContainer.Count;
|
||||
|
||||
var facade = new Facade();
|
||||
facadeContainer.Add(facade);
|
||||
|
||||
var cell = new Cell(index, content) { ToggleMaximisationState = toggleMaximisationState };
|
||||
cell.SetFacade(facade);
|
||||
|
||||
cellContainer.Add(cell);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The content added to this grid.
|
||||
/// </summary>
|
||||
public IEnumerable<Drawable> Content => cellContainer.OrderBy(c => c.FacadeIndex).Select(c => c.Content);
|
||||
|
||||
// A depth value that gets decremented every time a new instance is maximised in order to reduce underlaps.
|
||||
private float maximisedInstanceDepth;
|
||||
|
||||
private void toggleMaximisationState(Cell target)
|
||||
{
|
||||
// Iterate through all cells to ensure only one is maximised at any time.
|
||||
foreach (var i in cellContainer.ToList())
|
||||
{
|
||||
if (i == target)
|
||||
i.IsMaximised = !i.IsMaximised;
|
||||
else
|
||||
i.IsMaximised = false;
|
||||
|
||||
if (i.IsMaximised)
|
||||
{
|
||||
// Transfer cell to the maximised facade.
|
||||
i.SetFacade(maximisedFacade);
|
||||
cellContainer.ChangeChildDepth(i, maximisedInstanceDepth -= 0.001f);
|
||||
}
|
||||
else
|
||||
{
|
||||
// Transfer cell back to its original facade.
|
||||
i.SetFacade(facadeContainer[i.FacadeIndex]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
// Different layouts are used for varying cell counts in order to maximise dimensions.
|
||||
Vector2 cellsPerDimension;
|
||||
|
||||
switch (facadeContainer.Count)
|
||||
{
|
||||
case 1:
|
||||
cellsPerDimension = Vector2.One;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
cellsPerDimension = new Vector2(2, 1);
|
||||
break;
|
||||
|
||||
case 3:
|
||||
case 4:
|
||||
cellsPerDimension = new Vector2(2);
|
||||
break;
|
||||
|
||||
case 5:
|
||||
case 6:
|
||||
cellsPerDimension = new Vector2(3, 2);
|
||||
break;
|
||||
|
||||
case 7:
|
||||
case 8:
|
||||
case 9:
|
||||
// 3 rows / 3 cols.
|
||||
cellsPerDimension = new Vector2(3);
|
||||
break;
|
||||
|
||||
case 10:
|
||||
case 11:
|
||||
case 12:
|
||||
// 3 rows / 4 cols.
|
||||
cellsPerDimension = new Vector2(4, 3);
|
||||
break;
|
||||
|
||||
default:
|
||||
// 4 rows / 4 cols.
|
||||
cellsPerDimension = new Vector2(4);
|
||||
break;
|
||||
}
|
||||
|
||||
// Total inter-cell spacing.
|
||||
Vector2 totalCellSpacing = player_spacing * (cellsPerDimension - Vector2.One);
|
||||
|
||||
Vector2 fullSize = paddingContainer.ChildSize - totalCellSpacing;
|
||||
Vector2 cellSize = Vector2.Divide(fullSize, new Vector2(cellsPerDimension.X, cellsPerDimension.Y));
|
||||
|
||||
foreach (var cell in facadeContainer)
|
||||
cell.Size = cellSize;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,99 @@
|
||||
// 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.
|
||||
|
||||
using System;
|
||||
using JetBrains.Annotations;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.Input.Events;
|
||||
using osuTK;
|
||||
|
||||
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
|
||||
{
|
||||
public partial class PlayerGrid
|
||||
{
|
||||
/// <summary>
|
||||
/// A cell of the grid. Contains the content and tracks to the linked facade.
|
||||
/// </summary>
|
||||
private class Cell : CompositeDrawable
|
||||
{
|
||||
/// <summary>
|
||||
/// The index of the original facade of this cell.
|
||||
/// </summary>
|
||||
public readonly int FacadeIndex;
|
||||
|
||||
/// <summary>
|
||||
/// The contained content.
|
||||
/// </summary>
|
||||
public readonly Drawable Content;
|
||||
|
||||
/// <summary>
|
||||
/// An action that toggles the maximisation state of this cell.
|
||||
/// </summary>
|
||||
public Action<Cell> ToggleMaximisationState;
|
||||
|
||||
/// <summary>
|
||||
/// Whether this cell is currently maximised.
|
||||
/// </summary>
|
||||
public bool IsMaximised;
|
||||
|
||||
private Facade facade;
|
||||
private bool isTracking = true;
|
||||
|
||||
public Cell(int facadeIndex, Drawable content)
|
||||
{
|
||||
FacadeIndex = facadeIndex;
|
||||
|
||||
Origin = Anchor.Centre;
|
||||
InternalChild = Content = content;
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
if (isTracking)
|
||||
{
|
||||
Position = getFinalPosition();
|
||||
Size = getFinalSize();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Makes this cell track a new facade.
|
||||
/// </summary>
|
||||
public void SetFacade([NotNull] Facade newFacade)
|
||||
{
|
||||
Facade lastFacade = facade;
|
||||
facade = newFacade;
|
||||
|
||||
if (lastFacade == null || lastFacade == newFacade)
|
||||
return;
|
||||
|
||||
isTracking = false;
|
||||
|
||||
this.MoveTo(getFinalPosition(), 400, Easing.OutQuint).ResizeTo(getFinalSize(), 400, Easing.OutQuint)
|
||||
.Then()
|
||||
.OnComplete(_ =>
|
||||
{
|
||||
if (facade == newFacade)
|
||||
isTracking = true;
|
||||
});
|
||||
}
|
||||
|
||||
private Vector2 getFinalPosition()
|
||||
{
|
||||
var topLeft = Parent.ToLocalSpace(facade.ToScreenSpace(Vector2.Zero));
|
||||
return topLeft + facade.DrawSize / 2;
|
||||
}
|
||||
|
||||
private Vector2 getFinalSize() => facade.DrawSize;
|
||||
|
||||
protected override bool OnClick(ClickEvent e)
|
||||
{
|
||||
ToggleMaximisationState(this);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
// 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.
|
||||
|
||||
using osu.Framework.Graphics;
|
||||
|
||||
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Spectate
|
||||
{
|
||||
public partial class PlayerGrid
|
||||
{
|
||||
/// <summary>
|
||||
/// A facade of the grid which is used as a dummy object to store the required position/size of cells.
|
||||
/// </summary>
|
||||
private class Facade : Drawable
|
||||
{
|
||||
public Facade()
|
||||
{
|
||||
Anchor = Anchor.Centre;
|
||||
Origin = Anchor.Centre;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user