h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 18:27:26 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into remove-dragbar

Browse Source
This commit is contained in:
Jai Sharma 2017-07-06 20:14:08 +01:00 committed by GitHub
commit 6eaeba5a92
75 changed files with 345 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 2f7ebfcf637cc1928d8d37f6336e5da77f4926a0
Subproject commit 672e318d541f6a7106a0a2b088dd3ec5e8bff5db

2
osu-resources

@ -1 +1 @@
Subproject commit 10fda22522ffadbdbc43fa0f3683a065e536f7d1
Subproject commit 900f47563f5598eef7cbf203f0b3f2166508b6d5

2
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -125,7 +125,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
{
if (!userTriggered && Time.Current >= slider.EndTime)
{
var ticksCount = ticks.Children.Count() + 1;
var ticksCount = ticks.Children.Count + 1;
var ticksHit = ticks.Children.Count(t => t.Judgement.Result == HitResult.Hit);
if (initialCircle.Judgement.Result == HitResult.Hit)
ticksHit++;

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
View File

@ -118,7 +118,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
base.Update();
if (Time.Current < slider.EndTime)
Tracking = canCurrentlyTrack && lastState != null && Contains(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
Tracking = canCurrentlyTrack && lastState != null && ReceiveMouseInputAt(lastState.Mouse.NativeState.Position) && lastState.Mouse.HasMainButtonPressed;
}
public void UpdateProgress(double progress, int repeat)

2
osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
};
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
private bool tracking;
public bool Tracking

35
osu.Game/Graphics/Containers/OsuClickableContainer.cs Normal file
View File

@ -0,0 +1,35 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
namespace osu.Game.Graphics.Containers
{
public class OsuClickableContainer : ClickableContainer
{
protected SampleChannel SampleClick, SampleHover;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
SampleHover = audio.Sample.Get(@"UI/generic-hover");
SampleClick = audio.Sample.Get(@"UI/generic-click");
}
protected override bool OnHover(InputState state)
{
SampleHover?.Play();
return base.OnHover(state);
}
protected override bool OnClick(InputState state)
{
SampleClick?.Play();
return base.OnClick(state);
}
}
}

38
osu.Game/Graphics/Containers/OsuFocusedOverlayContainer.cs Normal file
View File

@ -0,0 +1,38 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Containers;
namespace osu.Game.Graphics.Containers
{
public class OsuFocusedOverlayContainer : FocusedOverlayContainer
{
private SampleChannel samplePopIn;
private SampleChannel samplePopOut;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
samplePopIn = audio.Sample.Get(@"UI/melodic-5");
samplePopOut = audio.Sample.Get(@"UI/melodic-4");
StateChanged += OsuFocusedOverlayContainer_StateChanged;
}
private void OsuFocusedOverlayContainer_StateChanged(VisibilityContainer arg1, Visibility arg2)
{
switch (arg2)
{
case Visibility.Visible:
samplePopIn?.Play();
break;
case Visibility.Hidden:
samplePopOut?.Play();
break;
}
}
}
}

2
osu.Game/Graphics/Cursor/CursorTrail.cs
View File

@ -74,7 +74,7 @@ namespace osu.Game.Graphics.Cursor
}
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
[BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures)

4
osu.Game/Graphics/UserInterface/BackButton.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
namespace osu.Game.Graphics.UserInterface
@ -18,9 +17,8 @@ namespace osu.Game.Graphics.UserInterface
}
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
private void load(OsuColour colours)
{
ActivationSound = audio.Sample.Get(@"Menu/menuback");
BackgroundColour = colours.Pink;
HoverColour = colours.PinkDark;
}

2
osu.Game/Graphics/UserInterface/BarGraph.cs
View File

@ -29,7 +29,7 @@ namespace osu.Game.Graphics.UserInterface
base.Direction = (direction & BarDirection.Horizontal) > 0 ? FillDirection.Vertical : FillDirection.Horizontal;
foreach (var bar in Children)
{
bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / Children.Count()) : new Vector2(1.0f / Children.Count(), 1);
bar.Size = (direction & BarDirection.Horizontal) > 0 ? new Vector2(1, 1.0f / Children.Count) : new Vector2(1.0f / Children.Count, 1);
bar.Direction = direction;
}
}

2
osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Graphics.UserInterface
public readonly TextAwesome Chevron;
//don't allow clicking between transitions and don't make the chevron clickable
public override bool Contains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => Alpha == 1f && Text.ReceiveMouseInputAt(screenSpacePos);
public override bool HandleInput => State == Visibility.Visible;
private Visibility state;

14
osu.Game/Graphics/UserInterface/DialogButton.cs
View File

@ -8,14 +8,14 @@ using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Containers;
using osu.Framework.Audio.Sample;
using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
using osu.Framework.Extensions.Color4Extensions;
using osu.Game.Graphics.Containers;
namespace osu.Game.Graphics.UserInterface
{
public class DialogButton : ClickableContainer
public class DialogButton : OsuClickableContainer
{
private const float hover_width = 0.9f;
private const float hover_duration = 500;
@ -79,8 +79,6 @@ namespace osu.Game.Graphics.UserInterface
}
}
public SampleChannel SampleClick, SampleHover;
private readonly Container backgroundContainer;
private readonly Container colourContainer;
private readonly Container glowContainer;
@ -93,15 +91,13 @@ namespace osu.Game.Graphics.UserInterface
private bool didClick; // Used for making sure that the OnMouseDown animation can call instead of OnHoverLost's when clicking
public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => backgroundContainer.ReceiveMouseInputAt(screenSpacePos);
protected override bool OnClick(Framework.Input.InputState state)
{
didClick = true;
colourContainer.ResizeTo(new Vector2(1.5f, 1f), click_duration, EasingTypes.In);
flash();
SampleClick?.Play();
Action?.Invoke();
Delay(click_duration);
Schedule(delegate {
@ -110,7 +106,7 @@ namespace osu.Game.Graphics.UserInterface
glowContainer.FadeOut();
});
return true;
return base.OnClick(state);
}
protected override bool OnHover(Framework.Input.InputState state)
@ -119,7 +115,7 @@ namespace osu.Game.Graphics.UserInterface
colourContainer.ResizeTo(new Vector2(hover_width, 1f), hover_duration, EasingTypes.OutElastic);
glowContainer.FadeIn(glow_fade_duration, EasingTypes.Out);
SampleHover?.Play();
base.OnHover(state);
return true;
}

3
osu.Game/Graphics/UserInterface/IconButton.cs
View File

@ -9,10 +9,11 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Input;
using osu.Game.Graphics.Containers;
namespace osu.Game.Graphics.UserInterface
{
public class IconButton : ClickableContainer
public class IconButton : OsuClickableContainer
{
private readonly TextAwesome icon;
private readonly Box hover;

17
osu.Game/Graphics/UserInterface/OsuButton.cs
View File

@ -3,6 +3,8 @@
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Shapes;
@ -18,6 +20,9 @@ namespace osu.Game.Graphics.UserInterface
{
private Box hover;
private SampleChannel sampleClick;
private SampleChannel sampleHover;
public OsuButton()
{
Height = 40;
@ -34,7 +39,7 @@ namespace osu.Game.Graphics.UserInterface
public override bool HandleInput => Action != null;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load(OsuColour colours, AudioManager audio)
{
if (Action == null)
Colour = OsuColour.Gray(0.5f);
@ -60,10 +65,20 @@ namespace osu.Game.Graphics.UserInterface
Alpha = 0,
},
});
sampleClick = audio.Sample.Get(@"UI/generic-click");
sampleHover = audio.Sample.Get(@"UI/generic-hover");
}
protected override bool OnClick(InputState state)
{
sampleClick?.Play();
return base.OnClick(state);
}
protected override bool OnHover(InputState state)
{
sampleHover?.Play();
hover.FadeIn(200);
return base.OnHover(state);
}

4
osu.Game/Graphics/UserInterface/OsuCheckbox.cs
View File

@ -106,8 +106,8 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleChecked = audio.Sample.Get(@"Checkbox/check-on");
sampleUnchecked = audio.Sample.Get(@"Checkbox/check-off");
sampleChecked = audio.Sample.Get(@"UI/check-on");
sampleUnchecked = audio.Sample.Get(@"UI/check-off");
}
}
}

4
osu.Game/Graphics/UserInterface/OsuContextMenuItem.cs
View File

@ -65,8 +65,8 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleHover = audio.Sample.Get(@"Menu/menuclick");
sampleClick = audio.Sample.Get(@"Menu/menuback");
sampleHover = audio.Sample.Get(@"UI/generic-hover");
sampleClick = audio.Sample.Get(@"UI/generic-click");
BackgroundColour = Color4.Transparent;
BackgroundColourHover = OsuColour.FromHex(@"172023");

2
osu.Game/Graphics/UserInterface/OsuSliderBar.cs
View File

@ -100,7 +100,7 @@ namespace osu.Game.Graphics.UserInterface
[BackgroundDependencyLoader]
private void load(AudioManager audio, OsuColour colours)
{
sample = audio.Sample.Get(@"Sliderbar/sliderbar");
sample = audio.Sample.Get(@"UI/sliderbar-notch");
AccentColour = colours.Pink;
}

2
osu.Game/Graphics/UserInterface/OsuTabControl.cs
View File

@ -23,8 +23,6 @@ namespace osu.Game.Graphics.UserInterface
protected override TabItem<T> CreateTabItem(T value) => new OsuTabItem(value);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || Dropdown.Contains(screenSpacePos);
private bool isEnumType => typeof(T).IsEnum;
public OsuTabControl()

8
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@ -18,7 +17,7 @@ using osu.Framework.Graphics.Shapes;
namespace osu.Game.Graphics.UserInterface
{
public class TwoLayerButton : ClickableContainer
public class TwoLayerButton : OsuClickableContainer
{
private readonly BouncingIcon bouncingIcon;
@ -32,7 +31,6 @@ namespace osu.Game.Graphics.UserInterface
public static readonly Vector2 SIZE_EXTENDED = new Vector2(140, 50);
public static readonly Vector2 SIZE_RETRACTED = new Vector2(100, 50);
public SampleChannel ActivationSound;
private readonly SpriteText text;
public Color4 HoverColour;
@ -171,7 +169,7 @@ namespace osu.Game.Graphics.UserInterface
}
}
public override bool Contains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => IconLayer.ReceiveMouseInputAt(screenSpacePos) || TextLayer.ReceiveMouseInputAt(screenSpacePos);
protected override bool OnHover(InputState state)
{
@ -210,8 +208,6 @@ namespace osu.Game.Graphics.UserInterface
flash.FadeOut(500, EasingTypes.OutQuint);
flash.Expire();
ActivationSound.Play();
return base.OnClick(state);
}

3
osu.Game/Overlays/Chat/ChannelListItem.cs
View File

@ -12,10 +12,11 @@ using osu.Framework.Input;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Chat;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Chat
{
public class ChannelListItem : ClickableContainer, IFilterable
public class ChannelListItem : OsuClickableContainer, IFilterable
{
private const float width_padding = 5;
private const float channel_width = 150;

2
osu.Game/Overlays/Chat/ChannelSection.cs
View File

@ -35,7 +35,7 @@ namespace osu.Game.Overlays.Chat
public IEnumerable<Channel> Channels
{
set { ChannelFlow.Children = value.Select(c => new ChannelListItem(c)); }
set { ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c)); }
}
public ChannelSection()

5
osu.Game/Overlays/Chat/ChannelSelectionOverlay.cs
View File

@ -16,10 +16,11 @@ using osu.Game.Graphics.Backgrounds;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterface;
using osu.Game.Online.Chat;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Chat
{
public class ChannelSelectionOverlay : FocusedOverlayContainer
public class ChannelSelectionOverlay : OsuFocusedOverlayContainer
{
public static readonly float WIDTH_PADDING = 170;
@ -38,7 +39,7 @@ namespace osu.Game.Overlays.Chat
{
set
{
sectionsFlow.Children = value;
sectionsFlow.ChildrenEnumerable = value;
foreach (ChannelSection s in sectionsFlow.Children)
{

5
osu.Game/Overlays/ChatOverlay.cs
View File

@ -22,10 +22,11 @@ using osu.Framework.Input;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Overlays.Chat;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public class ChatOverlay : FocusedOverlayContainer, IOnlineComponent
public class ChatOverlay : OsuFocusedOverlayContainer, IOnlineComponent
{
private const float textbox_height = 60;
private const float channel_selection_min_height = 0.3f;
@ -59,7 +60,7 @@ namespace osu.Game.Overlays
private readonly Container channelSelectionContainer;
private readonly ChannelSelectionOverlay channelSelection;
public override bool Contains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => chatContainer.ReceiveMouseInputAt(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.ReceiveMouseInputAt(screenSpacePos);
public ChatOverlay()
{

5
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -15,10 +15,11 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Dialog
{
public class PopupDialog : FocusedOverlayContainer
public class PopupDialog : OsuFocusedOverlayContainer
{
public static readonly float ENTER_DURATION = 500;
public static readonly float EXIT_DURATION = 200;
@ -56,7 +57,7 @@ namespace osu.Game.Overlays.Dialog
get { return buttonsContainer.Children; }
set
{
buttonsContainer.Children = value;
buttonsContainer.ChildrenEnumerable = value;
foreach (PopupDialogButton b in value)
{
var action = b.Action;

5
osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Dialog
@ -10,11 +9,9 @@ namespace osu.Game.Overlays.Dialog
public class PopupDialogCancelButton : PopupDialogButton
{
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
private void load(OsuColour colours)
{
ButtonColour = colours.Blue;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}
}
}

5
osu.Game/Overlays/Dialog/PopupDialogOkButton.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
namespace osu.Game.Overlays.Dialog
@ -10,11 +9,9 @@ namespace osu.Game.Overlays.Dialog
public class PopupDialogOkButton : PopupDialogButton
{
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
private void load(OsuColour colours)
{
ButtonColour = colours.Pink;
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menu-play-click");
}
}
}

3
osu.Game/Overlays/DialogOverlay.cs
View File

@ -7,10 +7,11 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Overlays.Dialog;
using OpenTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public class DialogOverlay : FocusedOverlayContainer
public class DialogOverlay : OsuFocusedOverlayContainer
{
private readonly Container dialogContainer;
private PopupDialog currentDialog;

3
osu.Game/Overlays/Direct/DirectListPanel.cs
View File

@ -16,6 +16,7 @@ using osu.Framework.Graphics.Textures;
using System.Linq;
using osu.Framework.Input;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Direct
{
@ -151,7 +152,7 @@ namespace osu.Game.Overlays.Direct
};
}
private class DownloadButton : ClickableContainer
private class DownloadButton : OsuClickableContainer
{
private readonly TextAwesome icon;

2
osu.Game/Overlays/Direct/DirectPanel.cs
View File

@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Direct
SetInfo = setInfo;
}
protected IEnumerable<DifficultyIcon> GetDifficultyIcons()
protected List<DifficultyIcon> GetDifficultyIcons()
{
var icons = new List<DifficultyIcon>();

3
osu.Game/Overlays/Direct/FilterControl.cs
View File

@ -9,6 +9,7 @@ using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Overlays.SearchableList;
namespace osu.Game.Overlays.Direct
@ -42,7 +43,7 @@ namespace osu.Game.Overlays.Direct
}
}
private class RulesetToggleButton : ClickableContainer
private class RulesetToggleButton : OsuClickableContainer
{
private readonly TextAwesome icon;

2
osu.Game/Overlays/DirectOverlay.cs
View File

@ -129,7 +129,7 @@ namespace osu.Game.Overlays
private void recreatePanels(PanelDisplayStyle displayStyle)
{
if (BeatmapSets == null) return;
panels.Children = BeatmapSets.Select(b => displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } : new DirectListPanel(b));
panels.ChildrenEnumerable = BeatmapSets.Select(b => displayStyle == PanelDisplayStyle.Grid ? (DirectPanel)new DirectGridPanel(b) { Width = 400 } : new DirectListPanel(b));
}
public class ResultCounts

3
osu.Game/Overlays/LoginOverlay.cs
View File

@ -8,10 +8,11 @@ using osu.Game.Graphics;
using osu.Game.Overlays.Settings.Sections.General;
using OpenTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
internal class LoginOverlay : FocusedOverlayContainer
internal class LoginOverlay : OsuFocusedOverlayContainer
{
private LoginSettings settingsSection;

6
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -151,8 +151,8 @@ namespace osu.Game.Overlays.Mods
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleOn = audio.Sample.Get(@"Checkbox/check-on");
sampleOff = audio.Sample.Get(@"Checkbox/check-off");
sampleOn = audio.Sample.Get(@"UI/check-on");
sampleOff = audio.Sample.Get(@"UI/check-off");
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -171,7 +171,7 @@ namespace osu.Game.Overlays.Mods
public void SelectNext()
{
(++SelectedIndex == -1 ? sampleOff : sampleOn).Play();
(++SelectedIndex == Mods.Length ? sampleOff : sampleOn).Play();
Action?.Invoke(SelectedMod);
}

3
osu.Game/Overlays/MusicController.cs
View File

@ -26,10 +26,11 @@ using osu.Framework.Threading;
using osu.Game.Overlays.Music;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public class MusicController : FocusedOverlayContainer
public class MusicController : OsuFocusedOverlayContainer
{
private const float player_height = 130;

3
osu.Game/Overlays/NotificationManager.cs
View File

@ -9,10 +9,11 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Overlays.Notifications;
using OpenTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public class NotificationManager : FocusedOverlayContainer
public class NotificationManager : OsuFocusedOverlayContainer
{
private const float width = 320;

3
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -13,6 +13,7 @@ using osu.Game.Graphics;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Notifications
{
@ -152,7 +153,7 @@ namespace osu.Game.Overlays.Notifications
Expire();
}
private class CloseButton : ClickableContainer
private class CloseButton : OsuClickableContainer
{
private Color4 hoverColour;

3
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
using OpenTK;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Notifications
{
@ -131,7 +132,7 @@ namespace osu.Game.Overlays.Notifications
countText.Text = notifications.Children.Count(c => c.Alpha > 0.99f).ToString();
}
private class ClearAllButton : ClickableContainer
private class ClearAllButton : OsuClickableContainer
{
private readonly OsuSpriteText text;

5
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions;
@ -182,7 +181,7 @@ namespace osu.Game.Overlays
textLine2.Origin = optionCount > 0 ? Anchor.BottomCentre : Anchor.Centre;
textLine2.Y = optionCount > 0 ? 0 : 5;
if (optionLights.Children.Count() != optionCount)
if (optionLights.Children.Count != optionCount)
{
optionLights.Clear();
for (int i = 0; i < optionCount; i++)
@ -190,7 +189,7 @@ namespace osu.Game.Overlays
}
for (int i = 0; i < optionCount; i++)
optionLights.Children.Skip(i).First().Glowing = i == selectedOption;
optionLights.Children[i].Glowing = i == selectedOption;
});
}

3
osu.Game/Overlays/SearchableList/DisplayStyleControl.cs
View File

@ -6,6 +6,7 @@ using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.SearchableList
{
@ -52,7 +53,7 @@ namespace osu.Game.Overlays.SearchableList
DisplayStyle.Value = PanelDisplayStyle.Grid;
}
private class DisplayStyleToggleButton : ClickableContainer
private class DisplayStyleToggleButton : OsuClickableContainer
{
private readonly TextAwesome icon;
private readonly PanelDisplayStyle style;

3
osu.Game/Overlays/SearchableList/SearchableListFilterControl.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
@ -29,8 +28,6 @@ namespace osu.Game.Overlays.SearchableList
protected abstract T DefaultTab { get; }
protected virtual Drawable CreateSupplementaryControls() => null;
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || DisplayStyleControl.Dropdown.Contains(screenSpacePos);
protected SearchableListFilterControl()
{
if (!typeof(T).IsEnum)

2
osu.Game/Overlays/SettingsOverlay.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Overlays.Settings.Sections;
namespace osu.Game.Overlays
{
public class SettingsOverlay : FocusedOverlayContainer
public class SettingsOverlay : OsuFocusedOverlayContainer
{
internal const float CONTENT_MARGINS = 10;

2
osu.Game/Overlays/SocialOverlay.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Overlays
panelFlow.Clear();
else
{
panelFlow.Children = users.Select(u =>
panelFlow.ChildrenEnumerable = users.Select(u =>
{
var p = new UserPanel(u) { Width = 300 };
p.Status.BindTo(u.Status);

21
osu.Game/Overlays/Toolbar/ToolbarButton.cs
View File

@ -1,10 +1,6 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -16,10 +12,11 @@ using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays.Toolbar
{
public class ToolbarButton : Container
public class ToolbarButton : OsuClickableContainer
{
public const float WIDTH = Toolbar.HEIGHT * 1.4f;
@ -58,7 +55,6 @@ namespace osu.Game.Overlays.Toolbar
protected virtual Anchor TooltipAnchor => Anchor.TopLeft;
public Action Action;
protected TextAwesome DrawableIcon;
protected SpriteText DrawableText;
protected Box HoverBackground;
@ -66,7 +62,6 @@ namespace osu.Game.Overlays.Toolbar
private readonly SpriteText tooltip1;
private readonly SpriteText tooltip2;
protected FillFlowContainer Flow;
private SampleChannel sampleClick;
public ToolbarButton()
{
@ -136,27 +131,19 @@ namespace osu.Game.Overlays.Toolbar
};
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleClick = audio.Sample.Get(@"Menu/menuclick");
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;
protected override bool OnClick(InputState state)
{
Action?.Invoke();
sampleClick.Play();
HoverBackground.FlashColour(Color4.White.Opacity(100), 500, EasingTypes.OutQuint);
return true;
return base.OnClick(state);
}
protected override bool OnHover(InputState state)
{
HoverBackground.FadeIn(200);
tooltipContainer.FadeIn(100);
return false;
return base.OnHover(state);
}
protected override void OnHoverLost(InputState state)

7
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -113,8 +113,11 @@ namespace osu.Game.Overlays.Toolbar
{
base.UpdateAfterChildren();
if (!activeMode.EnsureValid())
activeMode.Refresh(() => modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint));
if (!activeMode.IsValid)
{
modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint);
activeMode.Validate();
}
}
}
}

3
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -8,10 +8,11 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
using System;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Overlays
{
public abstract class WaveOverlayContainer : FocusedOverlayContainer
public abstract class WaveOverlayContainer : OsuFocusedOverlayContainer
{
protected const float APPEAR_DURATION = 800;
protected const float DISAPPEAR_DURATION = 500;

19
osu.Game/Rulesets/Timing/DrawableTimingSection.cs
View File

@ -80,14 +80,9 @@ namespace osu.Game.Rulesets.Timing
base.InvalidateFromChild(invalidation);
}
private Cached<double> durationBacking = new Cached<double>();
/// <summary>
/// The maximum duration of any one hit object inside this <see cref="DrawableTimingSection"/>. This is calculated as the maximum
/// end time between all hit objects relative to this <see cref="DrawableTimingSection"/>'s <see cref="MultiplierControlPoint.StartTime"/>.
/// </summary>
public double Duration => durationBacking.EnsureValid()
? durationBacking.Value
: durationBacking.Refresh(() =>
private Cached<double> durationBacking;
private double computeDuration()
{
if (!Children.Any())
return 0;
@ -117,7 +112,13 @@ namespace osu.Game.Rulesets.Timing
baseDuration *= 1 + maxAbsoluteSize / ourAbsoluteSize;
return baseDuration;
});
}
/// <summary>
/// The maximum duration of any one hit object inside this <see cref="DrawableTimingSection"/>. This is calculated as the maximum
/// end time between all hit objects relative to this <see cref="DrawableTimingSection"/>'s <see cref="MultiplierControlPoint.StartTime"/>.
/// </summary>
public double Duration => durationBacking.IsValid ? durationBacking : (durationBacking.Value = computeDuration());
protected override void Update()
{

26
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

@ -2,16 +2,38 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Graphics.Backgrounds;
namespace osu.Game.Screens.Backgrounds
{
public class BackgroundScreenDefault : BackgroundScreen
{
private int currentDisplay;
private const int background_count = 5;
private string backgroundName => $@"Menu/menu-background-{currentDisplay % background_count + 1}";
private Background current;
[BackgroundDependencyLoader]
private void load()
{
Add(new Background(@"Backgrounds/bg1"));
display(new Background(backgroundName));
}
private void display(Background newBackground)
{
current?.FadeOut(800, EasingTypes.OutQuint);
current?.Expire();
Add(current = newBackground);
}
public void Next()
{
currentDisplay++;
LoadComponentAsync(new Background(backgroundName) { Depth = currentDisplay }, display);
}
}
}
}

5
osu.Game/Screens/Loader.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Screens;
using osu.Game.Screens.Menu;
namespace osu.Game.Screens
@ -20,9 +19,9 @@ namespace osu.Game.Screens
private void load(OsuGame game)
{
if (game.IsDeployedBuild)
LoadComponentAsync(new Disclaimer(), d => Push((Screen)d));
LoadComponentAsync(new Disclaimer(), d => Push(d));
else
LoadComponentAsync(new Intro(), d => Push((Screen)d));
LoadComponentAsync(new Intro(), d => Push(d));
}
}
}

18
osu.Game/Screens/Menu/Button.cs
View File

@ -30,16 +30,17 @@ namespace osu.Game.Screens.Menu
private readonly Container box;
private readonly Box boxHoverLayer;
private readonly TextAwesome icon;
private readonly string internalName;
private readonly string sampleName;
private readonly Action clickAction;
private readonly Key triggerKey;
private SampleChannel sampleClick;
private SampleChannel sampleHover;
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
public Button(string text, string sampleName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
{
this.internalName = internalName;
this.sampleName = sampleName;
this.clickAction = clickAction;
this.triggerKey = triggerKey;
@ -120,8 +121,7 @@ namespace osu.Game.Screens.Menu
{
if (State != ButtonState.Expanded) return true;
//if (OsuGame.Instance.IsActive)
// Game.Audio.PlaySamplePositional($@"menu-{internalName}-hover", @"menuclick");
sampleHover?.Play();
box.ScaleTo(new Vector2(1.5f, 1), 500, EasingTypes.OutElastic);
@ -222,7 +222,9 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
sampleClick = audio.Sample.Get($@"Menu/menu-{internalName}-click") ?? audio.Sample.Get(internalName.Contains(@"back") ? @"Menu/menuback" : @"Menu/menuhit");
sampleHover = audio.Sample.Get(@"Menu/hover");
if (!string.IsNullOrEmpty(sampleName))
sampleClick = audio.Sample.Get($@"Menu/{sampleName}");
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
@ -259,7 +261,7 @@ namespace osu.Game.Screens.Menu
private void trigger()
{
sampleClick.Play();
sampleClick?.Play();
clickAction?.Invoke();

28
osu.Game/Screens/Menu/ButtonSystem.cs
View File

@ -15,6 +15,8 @@ using osu.Game.Overlays.Toolbar;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio;
namespace osu.Game.Screens.Menu
{
@ -51,6 +53,8 @@ namespace osu.Game.Screens.Menu
private readonly List<Button> buttonsTopLevel = new List<Button>();
private readonly List<Button> buttonsPlay = new List<Button>();
private SampleChannel sampleBack;
public ButtonSystem()
{
RelativeSizeAxes = Axes.Both;
@ -82,8 +86,8 @@ namespace osu.Game.Screens.Menu
AutoSizeAxes = Axes.Both,
Children = new[]
{
settingsButton = new Button(@"settings", @"settings", FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", @"back", FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
settingsButton = new Button(@"settings", string.Empty, FontAwesome.fa_gear, new Color4(85, 85, 85, 255), () => OnSettings?.Invoke(), -WEDGE_WIDTH, Key.O),
backButton = new Button(@"back", string.Empty, FontAwesome.fa_osu_left_o, new Color4(51, 58, 94, 255), onBack, -WEDGE_WIDTH),
iconFacade = new Container //need a container to make the osu! icon flow properly.
{
Size = new Vector2(0, BUTTON_AREA_HEIGHT)
@ -101,23 +105,24 @@ namespace osu.Game.Screens.Menu
}
};
buttonsPlay.Add(new Button(@"solo", @"freeplay", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
buttonsPlay.Add(new Button(@"multi", @"multiplayer", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"charts", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
buttonsPlay.Add(new Button(@"solo", @"select-6", FontAwesome.fa_user, new Color4(102, 68, 204, 255), () => OnSolo?.Invoke(), WEDGE_WIDTH, Key.P));
buttonsPlay.Add(new Button(@"multi", @"select-5", FontAwesome.fa_users, new Color4(94, 63, 186, 255), () => OnMulti?.Invoke(), 0, Key.M));
buttonsPlay.Add(new Button(@"chart", @"select-5", FontAwesome.fa_osu_charts, new Color4(80, 53, 160, 255), () => OnChart?.Invoke()));
buttonsTopLevel.Add(new Button(@"play", @"play", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
buttonsTopLevel.Add(new Button(@"osu!editor", @"edit", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", @"direct", FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", @"exit", FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonsTopLevel.Add(new Button(@"play", @"select-1", FontAwesome.fa_osu_logo, new Color4(102, 68, 204, 255), onPlay, WEDGE_WIDTH, Key.P));
buttonsTopLevel.Add(new Button(@"osu!editor", @"select-5", FontAwesome.fa_osu_edit_o, new Color4(238, 170, 0, 255), () => OnEdit?.Invoke(), 0, Key.E));
buttonsTopLevel.Add(new Button(@"osu!direct", string.Empty, FontAwesome.fa_osu_chevron_down_o, new Color4(165, 204, 0, 255), () => OnDirect?.Invoke(), 0, Key.D));
buttonsTopLevel.Add(new Button(@"exit", string.Empty, FontAwesome.fa_osu_cross_o, new Color4(238, 51, 153, 255), onExit, 0, Key.Q));
buttonFlow.Add(buttonsPlay);
buttonFlow.Add(buttonsTopLevel);
}
[BackgroundDependencyLoader(true)]
private void load(OsuGame game = null)
private void load(AudioManager audio, OsuGame game = null)
{
toolbar = game?.Toolbar;
sampleBack = audio.Sample.Get(@"Menu/select-4");
}
protected override void LoadComplete()
@ -167,6 +172,7 @@ namespace osu.Game.Screens.Menu
private void onBack()
{
sampleBack?.Play();
State = MenuState.TopLevel;
}
@ -231,6 +237,8 @@ namespace osu.Game.Screens.Menu
osuLogo.RotateTo(20, EXIT_DELAY * 1.5f);
osuLogo.FadeOut(EXIT_DELAY);
}
else if (lastState == MenuState.TopLevel)
sampleBack?.Play();
break;
case MenuState.TopLevel:
buttonArea.Flush(true);

11
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Input;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers;
using osu.Game.Screens.Backgrounds;
using osu.Game.Screens.Charts;
@ -24,7 +25,7 @@ namespace osu.Game.Screens.Menu
internal override bool ShowOverlays => buttons.State != MenuState.Initial;
private readonly BackgroundScreen background;
private readonly BackgroundScreenDefault background;
private Screen songSelect;
protected override BackgroundScreen CreateBackground() => background;
@ -66,6 +67,12 @@ namespace osu.Game.Screens.Menu
preloadSongSelect();
}
protected override void OnBeatmapChanged(WorkingBeatmap beatmap)
{
base.OnBeatmapChanged(beatmap);
background.Next();
}
private void preloadSongSelect()
{
if (songSelect == null)
@ -111,6 +118,8 @@ namespace osu.Game.Screens.Menu
{
base.OnResuming(last);
background.Next();
//we may have consumed our preloaded instance, so let's make another.
preloadSongSelect();

30
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
set { colourAndTriangles.Alpha = value ? 1 : 0; }
}
public override bool Contains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => logoContainer.ReceiveMouseInputAt(screenSpacePos);
public bool Ripple
{
@ -72,11 +72,11 @@ namespace osu.Game.Screens.Menu
private const float default_size = 480;
private const double beat_in_time = 60;
private const double early_activation = 60;
public OsuLogo()
{
EarlyActivationMilliseconds = beat_in_time;
EarlyActivationMilliseconds = early_activation;
Size = new Vector2(default_size);
@ -215,8 +215,9 @@ namespace osu.Game.Screens.Menu
[BackgroundDependencyLoader]
private void load(TextureStore textures, AudioManager audio)
{
sampleClick = audio.Sample.Get(@"Menu/menuhit");
sampleClick = audio.Sample.Get(@"Menu/select-2");
sampleBeat = audio.Sample.Get(@"Menu/heartbeat");
logo.Texture = textures.Get(@"Menu/logo");
ripple.Texture = textures.Get(@"Menu/logo");
}
@ -227,9 +228,6 @@ namespace osu.Game.Screens.Menu
{
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
if (Hovering)
sampleBeat.Play();
lastBeatIndex = beatIndex;
var beatLength = timingPoint.BeatLength;
@ -238,8 +236,14 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
if (Hovering)
{
using (BeginDelayedSequence(early_activation))
Schedule(() => sampleBeat.Play());
}
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(early_activation))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);
ripple.ClearTransforms();
@ -255,11 +259,11 @@ namespace osu.Game.Screens.Menu
flashLayer.ClearTransforms();
visualizer.ClearTransforms();
flashLayer.FadeTo(0.2f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
visualizer.FadeTo(0.9f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (flashLayer.BeginDelayedSequence(beat_in_time))
flashLayer.FadeTo(0.2f * amplitudeAdjust, early_activation, EasingTypes.Out);
visualizer.FadeTo(0.9f * amplitudeAdjust, early_activation, EasingTypes.Out);
using (flashLayer.BeginDelayedSequence(early_activation))
flashLayer.FadeOut(beatLength);
using (visualizer.BeginDelayedSequence(beat_in_time))
using (visualizer.BeginDelayedSequence(early_activation))
visualizer.FadeTo(0.5f, beatLength);
}
}

3
osu.Game/Screens/Multiplayer/DrawableRoom.cs
View File

@ -11,13 +11,14 @@ using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Online.Multiplayer;
using osu.Game.Users;
namespace osu.Game.Screens.Multiplayer
{
public class DrawableRoom : ClickableContainer
public class DrawableRoom : OsuClickableContainer
{
private const float content_padding = 5;
private const float height = 90;

2
osu.Game/Screens/Multiplayer/RoomInspector.cs
View File

@ -495,7 +495,7 @@ namespace osu.Game.Screens.Multiplayer
levelRangeLower.Text = ranks.Min().ToString();
levelRangeHigher.Text = ranks.Max().ToString();
participantsFlow.Children = value.Select(u => new UserTile(u));
participantsFlow.ChildrenEnumerable = value.Select(u => new UserTile(u));
}
private class UserTile : Container, IHasTooltip

14
osu.Game/Screens/OsuScreen.cs
View File

@ -8,6 +8,8 @@ using osu.Game.Beatmaps;
using osu.Game.Database;
using osu.Game.Graphics.Containers;
using OpenTK;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio;
namespace osu.Game.Screens
{
@ -33,6 +35,8 @@ namespace osu.Game.Screens
private readonly Bindable<RulesetInfo> ruleset = new Bindable<RulesetInfo>();
private SampleChannel sampleExit;
public WorkingBeatmap Beatmap
{
get
@ -46,7 +50,7 @@ namespace osu.Game.Screens
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(OsuGameBase game, OsuGame osuGame)
private void load(OsuGameBase game, OsuGame osuGame, AudioManager audio)
{
if (game != null)
{
@ -59,6 +63,8 @@ namespace osu.Game.Screens
if (osuGame != null)
ruleset.BindTo(osuGame.Ruleset);
sampleExit = audio.Sample.Get(@"UI/melodic-1");
}
protected override void LoadComplete()
@ -82,6 +88,12 @@ namespace osu.Game.Screens
ruleset.Disabled = !AllowRulesetChange;
}
protected override void OnResuming(Screen last)
{
base.OnResuming(last);
sampleExit?.Play();
}
protected override void OnEntering(Screen last)
{
OsuScreen lastOsu = last as OsuScreen;

7
osu.Game/Screens/Play/HotkeyRetryOverlay.cs
View File

@ -4,8 +4,6 @@
using osu.Framework.Input;
using OpenTK.Input;
using osu.Framework.Allocation;
using osu.Framework.Audio.Sample;
using osu.Framework.Audio;
using System;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics;
@ -18,7 +16,6 @@ namespace osu.Game.Screens.Play
{
public Action Action;
private SampleChannel retrySample;
private Box overlay;
private const int activate_delay = 400;
@ -27,9 +24,8 @@ namespace osu.Game.Screens.Play
private bool fired;
[BackgroundDependencyLoader]
private void load(AudioManager audio)
private void load()
{
retrySample = audio.Sample.Get(@"Menu/menuback");
RelativeSizeAxes = Axes.Both;
AlwaysPresent = true;
@ -74,7 +70,6 @@ namespace osu.Game.Screens.Play
if (!fired && overlay.Alpha == 1)
{
fired = true;
retrySample.Play();
Action?.Invoke();
}
}

2
osu.Game/Screens/Play/KeyCounterCollection.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Screens.Play
this.target = target;
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
public override bool HandleInput => true;

2
osu.Game/Screens/Play/KeyCounterMouse.cs
View File

@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play
Button = button;
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => true;
private static string getStringRepresentation(MouseButton button)
{

7
osu.Game/Screens/Play/MenuOverlay.cs
View File

@ -11,7 +11,6 @@ using OpenTK;
using OpenTK.Graphics;
using osu.Game.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics.UserInterface;
using osu.Framework.Graphics.Shapes;
@ -191,12 +190,6 @@ namespace osu.Game.Screens.Play
public class Button : DialogButton
{
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
SampleHover = audio.Sample.Get(@"Menu/menuclick");
SampleClick = audio.Sample.Get(@"Menu/menuback");
}
}
}
}

6
osu.Game/Screens/Play/Player.cs
View File

@ -23,6 +23,7 @@ using osu.Framework.Threading;
using osu.Game.Rulesets.Mods;
using osu.Game.Rulesets.Scoring;
using osu.Game.Screens.Ranking;
using osu.Framework.Audio.Sample;
namespace osu.Game.Screens.Play
{
@ -61,6 +62,8 @@ namespace osu.Game.Screens.Play
private Bindable<bool> mouseWheelDisabled;
private Bindable<double> userAudioOffset;
private SampleChannel sampleRestart;
#endregion
private HUDOverlay hudOverlay;
@ -72,6 +75,8 @@ namespace osu.Game.Screens.Play
dimLevel = config.GetBindable<double>(OsuSetting.DimLevel);
mouseWheelDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableWheel);
sampleRestart = audio.Sample.Get(@"Gameplay/restart");
Ruleset rulesetInstance;
try
@ -215,6 +220,7 @@ namespace osu.Game.Screens.Play
public void Restart()
{
sampleRestart?.Play();
ValidForResume = false;
RestartRequested?.Invoke();
Exit();

17
osu.Game/Screens/Play/SkipButton.cs
View File

@ -4,7 +4,6 @@
using System;
using osu.Framework;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input;
@ -16,8 +15,8 @@ using osu.Game.Screens.Ranking;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Audio.Sample;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Play
{
@ -175,16 +174,14 @@ namespace osu.Game.Screens.Play
}
}
private class Button : Container
private class Button : OsuClickableContainer
{
public Action Action;
private Color4 colourNormal;
private Color4 colourHover;
private Box box;
private FillFlowContainer flow;
private Box background;
private AspectContainer aspect;
private SampleChannel activationSound;
public Button()
{
@ -192,10 +189,8 @@ namespace osu.Game.Screens.Play
}
[BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio)
private void load(OsuColour colours)
{
activationSound = audio.Sample.Get(@"Menu/menuhit");
colourNormal = colours.Yellow;
colourHover = colours.YellowDark;
@ -282,13 +277,9 @@ namespace osu.Game.Screens.Play
protected override bool OnClick(InputState state)
{
Action?.Invoke();
activationSound.Play();
box.FlashColour(Color4.White, 500, EasingTypes.OutQuint);
aspect.ScaleTo(1.2f, 2000, EasingTypes.OutQuint);
return true;
return base.OnClick(state);
}
}
}

7
osu.Game/Screens/Play/SquareGraph.cs
View File

@ -77,7 +77,12 @@ namespace osu.Game.Screens.Play
protected override void Update()
{
base.Update();
layout.Refresh(recreateGraph);
if (!layout.IsValid)
{
recreateGraph();
layout.Validate();
}
}
/// <summary>

2
osu.Game/Screens/Ranking/ResultsPageScore.cs
View File

@ -164,7 +164,7 @@ namespace osu.Game.Screens.Ranking
}
};
statisticsContainer.Children = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
statisticsContainer.ChildrenEnumerable = Score.Statistics.Select(s => new DrawableScoreStatistic(s));
}
protected override void LoadComplete()

8
osu.Game/Screens/ScreenWhiteBox.cs
View File

@ -11,8 +11,6 @@ using osu.Game.Screens.Backgrounds;
using osu.Game.Graphics.UserInterface;
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Game.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics.Shapes;
@ -196,12 +194,6 @@ namespace osu.Game.Screens
Anchor = Anchor.BottomRight;
Origin = Anchor.BottomRight;
}
[BackgroundDependencyLoader]
private void load(AudioManager audio)
{
ActivationSound = audio.Sample.Get(@"Menu/menuhit");
}
}
}
}

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

@ -77,8 +77,9 @@ namespace osu.Game.Screens.Select
private readonly List<Panel> panels = new List<Panel>();
private BeatmapGroup selectedGroup;
private readonly Stack<KeyValuePair<BeatmapGroup, BeatmapPanel>> randomSelectedBeatmaps = new Stack<KeyValuePair<BeatmapGroup, BeatmapPanel>>();
private BeatmapGroup selectedGroup;
private BeatmapPanel selectedPanel;
public BeatmapCarousel()
@ -170,16 +171,21 @@ namespace osu.Game.Screens.Select
} while (index != startIndex);
}
public void SelectRandom()
private IEnumerable<BeatmapGroup> getVisibleGroups() => groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden);
public void SelectNextRandom()
{
IEnumerable<BeatmapGroup> visibleGroups = groups.Where(selectGroup => selectGroup.State != BeatmapGroupState.Hidden);
randomSelectedBeatmaps.Push(new KeyValuePair<BeatmapGroup, BeatmapPanel>(selectedGroup, selectedGroup.SelectedPanel));
var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any())
return;
BeatmapGroup group;
if (randomType == SelectionRandomType.RandomPermutation)
{
IEnumerable<BeatmapGroup> notSeenGroups = visibleGroups.Except(seenGroups);
var notSeenGroups = visibleGroups.Except(seenGroups);
if (!notSeenGroups.Any())
{
seenGroups.Clear();
@ -197,6 +203,27 @@ namespace osu.Game.Screens.Select
selectGroup(group, panel);
}
public void SelectPreviousRandom()
{
if (!randomSelectedBeatmaps.Any())
return;
var visibleGroups = getVisibleGroups();
if (!visibleGroups.Any())
return;
while (randomSelectedBeatmaps.Any())
{
var beatmapCoordinates = randomSelectedBeatmaps.Pop();
var group = beatmapCoordinates.Key;
if (visibleGroups.Contains(group))
{
selectGroup(group, beatmapCoordinates.Value);
break;
}
}
}
private FilterCriteria criteria = new FilterCriteria();
private ScheduledDelegate filterTask;

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

@ -439,7 +439,7 @@ namespace osu.Game.Screens.Select
{
Show();
if (header.Text == "Tags")
content.Children = value.Split(' ').Select(text => new OsuSpriteText
content.ChildrenEnumerable = value.Split(' ').Select(text => new OsuSpriteText
{
Text = text,
Font = "Exo2.0-Regular",

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

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
private readonly SearchTextBox searchTextBox;
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || groupTabs.ReceiveMouseInputAt(screenSpacePos) || sortTabs.ReceiveMouseInputAt(screenSpacePos);
public FilterControl()
{

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

@ -124,7 +124,7 @@ namespace osu.Game.Screens.Select
updateModeLight();
}
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || StartButton.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => base.ReceiveMouseInputAt(screenSpacePos) || StartButton.ReceiveMouseInputAt(screenSpacePos);
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) => true;

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

@ -6,15 +6,15 @@ using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input;
using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select
{
public class FooterButton : ClickableContainer
public class FooterButton : OsuClickableContainer
{
private static readonly Vector2 shearing = new Vector2(0.15f, 0);

3
osu.Game/Screens/Select/Leaderboards/LeaderboardScore.cs
View File

@ -13,10 +13,11 @@ using osu.Game.Rulesets.Mods;
using osu.Game.Users;
using osu.Framework;
using osu.Game.Rulesets.Scoring;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Leaderboards
{
public class LeaderboardScore : ClickableContainer, IStateful<Visibility>
public class LeaderboardScore : OsuClickableContainer, IStateful<Visibility>
{
public static readonly float HEIGHT = 60;

5
osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
View File

@ -11,10 +11,11 @@ using osu.Game.Graphics.Sprites;
using OpenTK;
using OpenTK.Graphics;
using OpenTK.Input;
using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Options
{
public class BeatmapOptionsButton : ClickableContainer
public class BeatmapOptionsButton : OsuClickableContainer
{
private const float width = 130;
@ -83,7 +84,7 @@ namespace osu.Game.Screens.Select.Options
return false;
}
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool ReceiveMouseInputAt(Vector2 screenSpacePos) => box.ReceiveMouseInputAt(screenSpacePos);
public BeatmapOptionsButton()
{

2
osu.Game/Screens/Select/Options/BeatmapOptionsOverlay.cs
View File

@ -14,7 +14,7 @@ using osu.Game.Graphics.Containers;
namespace osu.Game.Screens.Select.Options
{
public class BeatmapOptionsOverlay : FocusedOverlayContainer
public class BeatmapOptionsOverlay : OsuFocusedOverlayContainer
{
private const float transition_duration = 500;
private const float x_position = 0.2f;

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

@ -154,11 +154,11 @@ namespace osu.Game.Screens.Select
}
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
private void load(BeatmapDatabase beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours, UserInputManager input)
{
if (Footer != null)
{
Footer.AddButton(@"random", colours.Green, SelectRandom, Key.F2);
Footer.AddButton(@"random", colours.Green, () => triggerRandom(input), Key.F2);
Footer.AddButton(@"options", colours.Blue, BeatmapOptions.ToggleVisibility, Key.F3);
BeatmapOptions.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, colours.Pink, promptDelete, Key.Number4, float.MaxValue);
@ -209,7 +209,13 @@ namespace osu.Game.Screens.Select
OnSelected();
}
public void SelectRandom() => carousel.SelectRandom();
private void triggerRandom(UserInputManager input)
{
if (input.CurrentState.Keyboard.ShiftPressed)
carousel.SelectPreviousRandom();
else
carousel.SelectNextRandom();
}
protected abstract void OnSelected();

2
osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
View File

@ -84,7 +84,7 @@ namespace osu.Game.Screens.Tournament.Components
{
base.UpdateAfterChildren();
while (Children.Count() < 3)
while (Children.Count < 3)
addLine();
float pos = leftPos;

2
osu.Game/osu.Game.csproj
View File

@ -76,6 +76,8 @@
<Compile Include="Audio\SampleInfoList.cs" />
<Compile Include="Beatmaps\Drawables\BeatmapBackgroundSprite.cs" />
<Compile Include="Beatmaps\DifficultyCalculator.cs" />
<Compile Include="Graphics\Containers\OsuClickableContainer.cs" />
<Compile Include="Graphics\Containers\OsuFocusedOverlayContainer.cs" />
<Compile Include="Graphics\Cursor\OsuContextMenuContainer.cs" />
<Compile Include="Graphics\UserInterface\IconButton.cs" />
<Compile Include="Configuration\SelectionRandomType.cs" />