mirror of
https://github.com/ppy/osu.git
synced 2025-02-06 15:53:21 +08:00
54982dcdd7
In theory this seemed like a good idea (and an optimisation in some cases, due to lower fill rate), but in practice this leads to weird edge cases. This aims to do away with the operations on external drawables by applying a dim to the area behind the `LoadingLayer` when required. I went over each usage and ensured they look as good or better than previously. The specific bad usage here was the restoration of the colour on dispose (if the `LoadingLayer` was disposed in a still-visible state). I'm aware that the `BeatmapListingOverlay` will now dim completely during load. I think this is fine for the time being.
350 lines
18 KiB
C#
350 lines
18 KiB
C#
// 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 osu.Framework.Allocation;
|
|
using osu.Framework.Bindables;
|
|
using osu.Framework.Extensions.Color4Extensions;
|
|
using osu.Framework.Extensions.ExceptionExtensions;
|
|
using osu.Framework.Graphics;
|
|
using osu.Framework.Graphics.Containers;
|
|
using osu.Framework.Graphics.Shapes;
|
|
using osu.Game.Beatmaps;
|
|
using osu.Game.Graphics;
|
|
using osu.Game.Graphics.Containers;
|
|
using osu.Game.Graphics.Sprites;
|
|
using osu.Game.Graphics.UserInterface;
|
|
using osu.Game.Online.Multiplayer;
|
|
using osu.Game.Online.Rooms;
|
|
using osu.Game.Overlays;
|
|
using osu.Game.Rulesets;
|
|
using osu.Game.Screens.OnlinePlay.Match.Components;
|
|
using osuTK;
|
|
|
|
namespace osu.Game.Screens.OnlinePlay.Multiplayer.Match
|
|
{
|
|
public class MultiplayerMatchSettingsOverlay : MatchSettingsOverlay
|
|
{
|
|
[BackgroundDependencyLoader]
|
|
private void load()
|
|
{
|
|
Child = Settings = new MatchSettings
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
RelativePositionAxes = Axes.Y,
|
|
SettingsApplied = Hide
|
|
};
|
|
}
|
|
|
|
protected class MatchSettings : OnlinePlayComposite
|
|
{
|
|
private const float disabled_alpha = 0.2f;
|
|
|
|
public Action SettingsApplied;
|
|
|
|
public OsuTextBox NameField, MaxParticipantsField;
|
|
public RoomAvailabilityPicker AvailabilityPicker;
|
|
public GameTypePicker TypePicker;
|
|
public TriangleButton ApplyButton;
|
|
|
|
public OsuSpriteText ErrorText;
|
|
|
|
private OsuSpriteText typeLabel;
|
|
private LoadingLayer loadingLayer;
|
|
private BeatmapSelectionControl initialBeatmapControl;
|
|
|
|
[Resolved]
|
|
private IRoomManager manager { get; set; }
|
|
|
|
[Resolved]
|
|
private StatefulMultiplayerClient client { get; set; }
|
|
|
|
[Resolved]
|
|
private Bindable<Room> currentRoom { get; set; }
|
|
|
|
[Resolved]
|
|
private Bindable<WorkingBeatmap> beatmap { get; set; }
|
|
|
|
[Resolved]
|
|
private Bindable<RulesetInfo> ruleset { get; set; }
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load(OsuColour colours)
|
|
{
|
|
InternalChildren = new Drawable[]
|
|
{
|
|
new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
Colour = Color4Extensions.FromHex(@"28242d"),
|
|
},
|
|
new GridContainer
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
RowDimensions = new[]
|
|
{
|
|
new Dimension(GridSizeMode.Distributed),
|
|
new Dimension(GridSizeMode.AutoSize),
|
|
},
|
|
Content = new[]
|
|
{
|
|
new Drawable[]
|
|
{
|
|
new OsuScrollContainer
|
|
{
|
|
Padding = new MarginPadding
|
|
{
|
|
Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING,
|
|
Vertical = 10
|
|
},
|
|
RelativeSizeAxes = Axes.Both,
|
|
Children = new[]
|
|
{
|
|
new FillFlowContainer
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Direction = FillDirection.Vertical,
|
|
Spacing = new Vector2(0, 10),
|
|
Children = new Drawable[]
|
|
{
|
|
new Container
|
|
{
|
|
Anchor = Anchor.TopCentre,
|
|
Origin = Anchor.TopCentre,
|
|
Padding = new MarginPadding { Horizontal = WaveOverlayContainer.WIDTH_PADDING },
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Children = new Drawable[]
|
|
{
|
|
new SectionContainer
|
|
{
|
|
Padding = new MarginPadding { Right = FIELD_PADDING / 2 },
|
|
Children = new[]
|
|
{
|
|
new Section("Room name")
|
|
{
|
|
Child = NameField = new SettingsTextBox
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
TabbableContentContainer = this,
|
|
},
|
|
},
|
|
new Section("Room visibility")
|
|
{
|
|
Alpha = disabled_alpha,
|
|
Child = AvailabilityPicker = new RoomAvailabilityPicker
|
|
{
|
|
Enabled = { Value = false }
|
|
},
|
|
},
|
|
new Section("Game type")
|
|
{
|
|
Alpha = disabled_alpha,
|
|
Child = new FillFlowContainer
|
|
{
|
|
AutoSizeAxes = Axes.Y,
|
|
RelativeSizeAxes = Axes.X,
|
|
Direction = FillDirection.Vertical,
|
|
Spacing = new Vector2(7),
|
|
Children = new Drawable[]
|
|
{
|
|
TypePicker = new GameTypePicker
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
Enabled = { Value = false }
|
|
},
|
|
typeLabel = new OsuSpriteText
|
|
{
|
|
Font = OsuFont.GetFont(size: 14),
|
|
Colour = colours.Yellow
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
new SectionContainer
|
|
{
|
|
Anchor = Anchor.TopRight,
|
|
Origin = Anchor.TopRight,
|
|
Padding = new MarginPadding { Left = FIELD_PADDING / 2 },
|
|
Children = new[]
|
|
{
|
|
new Section("Max participants")
|
|
{
|
|
Alpha = disabled_alpha,
|
|
Child = MaxParticipantsField = new SettingsNumberTextBox
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
TabbableContentContainer = this,
|
|
ReadOnly = true,
|
|
},
|
|
},
|
|
new Section("Password (optional)")
|
|
{
|
|
Alpha = disabled_alpha,
|
|
Child = new SettingsPasswordTextBox
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
TabbableContentContainer = this,
|
|
ReadOnly = true,
|
|
},
|
|
},
|
|
}
|
|
}
|
|
},
|
|
},
|
|
initialBeatmapControl = new BeatmapSelectionControl
|
|
{
|
|
Anchor = Anchor.TopCentre,
|
|
Origin = Anchor.TopCentre,
|
|
RelativeSizeAxes = Axes.X,
|
|
Width = 0.5f
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
},
|
|
new Drawable[]
|
|
{
|
|
new Container
|
|
{
|
|
Anchor = Anchor.BottomLeft,
|
|
Origin = Anchor.BottomLeft,
|
|
Y = 2,
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Children = new Drawable[]
|
|
{
|
|
new Box
|
|
{
|
|
RelativeSizeAxes = Axes.Both,
|
|
Colour = Color4Extensions.FromHex(@"28242d").Darken(0.5f).Opacity(1f),
|
|
},
|
|
new FillFlowContainer
|
|
{
|
|
RelativeSizeAxes = Axes.X,
|
|
AutoSizeAxes = Axes.Y,
|
|
Direction = FillDirection.Vertical,
|
|
Spacing = new Vector2(0, 20),
|
|
Margin = new MarginPadding { Vertical = 20 },
|
|
Padding = new MarginPadding { Horizontal = OsuScreen.HORIZONTAL_OVERFLOW_PADDING },
|
|
Children = new Drawable[]
|
|
{
|
|
ApplyButton = new CreateOrUpdateButton
|
|
{
|
|
Anchor = Anchor.BottomCentre,
|
|
Origin = Anchor.BottomCentre,
|
|
Size = new Vector2(230, 55),
|
|
Enabled = { Value = false },
|
|
Action = apply,
|
|
},
|
|
ErrorText = new OsuSpriteText
|
|
{
|
|
Anchor = Anchor.BottomCentre,
|
|
Origin = Anchor.BottomCentre,
|
|
Alpha = 0,
|
|
Depth = 1,
|
|
Colour = colours.RedDark
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
loadingLayer = new LoadingLayer(true)
|
|
};
|
|
|
|
TypePicker.Current.BindValueChanged(type => typeLabel.Text = type.NewValue?.Name ?? string.Empty, true);
|
|
RoomName.BindValueChanged(name => NameField.Text = name.NewValue, true);
|
|
Availability.BindValueChanged(availability => AvailabilityPicker.Current.Value = availability.NewValue, true);
|
|
Type.BindValueChanged(type => TypePicker.Current.Value = type.NewValue, true);
|
|
MaxParticipants.BindValueChanged(count => MaxParticipantsField.Text = count.NewValue?.ToString(), true);
|
|
RoomID.BindValueChanged(roomId => initialBeatmapControl.Alpha = roomId.NewValue == null ? 1 : 0, true);
|
|
}
|
|
|
|
protected override void Update()
|
|
{
|
|
base.Update();
|
|
|
|
ApplyButton.Enabled.Value = Playlist.Count > 0 && NameField.Text.Length > 0;
|
|
}
|
|
|
|
private void apply()
|
|
{
|
|
if (!ApplyButton.Enabled.Value)
|
|
return;
|
|
|
|
hideError();
|
|
loadingLayer.Show();
|
|
|
|
// If the client is already in a room, update via the client.
|
|
// Otherwise, update the room directly in preparation for it to be submitted to the API on match creation.
|
|
if (client.Room != null)
|
|
{
|
|
client.ChangeSettings(name: NameField.Text).ContinueWith(t => Schedule(() =>
|
|
{
|
|
if (t.IsCompletedSuccessfully)
|
|
onSuccess(currentRoom.Value);
|
|
else
|
|
onError(t.Exception?.AsSingular().Message ?? "Error changing settings.");
|
|
}));
|
|
}
|
|
else
|
|
{
|
|
currentRoom.Value.Name.Value = NameField.Text;
|
|
currentRoom.Value.Availability.Value = AvailabilityPicker.Current.Value;
|
|
currentRoom.Value.Type.Value = TypePicker.Current.Value;
|
|
|
|
if (int.TryParse(MaxParticipantsField.Text, out int max))
|
|
currentRoom.Value.MaxParticipants.Value = max;
|
|
else
|
|
currentRoom.Value.MaxParticipants.Value = null;
|
|
|
|
manager?.CreateRoom(currentRoom.Value, onSuccess, onError);
|
|
}
|
|
}
|
|
|
|
private void hideError() => ErrorText.FadeOut(50);
|
|
|
|
private void onSuccess(Room room)
|
|
{
|
|
loadingLayer.Hide();
|
|
SettingsApplied?.Invoke();
|
|
}
|
|
|
|
private void onError(string text)
|
|
{
|
|
ErrorText.Text = text;
|
|
ErrorText.FadeIn(50);
|
|
|
|
loadingLayer.Hide();
|
|
}
|
|
}
|
|
|
|
public class CreateOrUpdateButton : TriangleButton
|
|
{
|
|
[Resolved(typeof(Room), nameof(Room.RoomID))]
|
|
private Bindable<int?> roomId { get; set; }
|
|
|
|
protected override void LoadComplete()
|
|
{
|
|
base.LoadComplete();
|
|
roomId.BindValueChanged(id => Text = id.NewValue == null ? "Create" : "Update", true);
|
|
}
|
|
|
|
[BackgroundDependencyLoader]
|
|
private void load(OsuColour colours)
|
|
{
|
|
BackgroundColour = colours.Yellow;
|
|
Triangles.ColourLight = colours.YellowLight;
|
|
Triangles.ColourDark = colours.YellowDark;
|
|
}
|
|
}
|
|
}
|
|
}
|