h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 06:23:20 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into drawable-room-update

Browse Source
This commit is contained in:
Dean Herbert 2017-06-25 15:55:36 +09:00 committed by GitHub
commit df74a84b35
39 changed files with 39 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 97ff3376d1bdac3703d442e62f5ee6a36eb3b73f
Subproject commit a5e66079b9df3cf74a8bd1431c1cb7faad3c4d9f

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

@ -28,10 +28,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public DrawableSlider(Slider s) : base(s)
{
// Since the DrawableSlider itself is just a container without a size we need to
// pass all input through.
AlwaysReceiveInput = true;
SliderBouncer bouncer1;
slider = s;
@ -129,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/DrawableSpinner.cs
View File

@ -38,8 +38,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public DrawableSpinner(Spinner s) : base(s)
{
AlwaysReceiveInput = true;
Origin = Anchor.Centre;
Position = s.Position;

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

@ -31,7 +31,6 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
{
spinner = s;
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
Children = new Drawable[]
@ -40,6 +39,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
};
}
public override bool Contains(Vector2 screenSpacePos) => true;
private bool tracking;
public bool Tracking
{

2
osu.Game/Graphics/Containers/ParallaxContainer.cs
View File

@ -19,8 +19,6 @@ namespace osu.Game.Graphics.Containers
public ParallaxContainer()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
AddInternal(content = new Container
{

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

@ -65,7 +65,6 @@ namespace osu.Game.Graphics.Cursor
// as we are currently very dependent on having a running clock, let's make our own clock for the time being.
Clock = new FramedClock();
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
for (int i = 0; i < max_sprites; i++)
@ -75,6 +74,8 @@ namespace osu.Game.Graphics.Cursor
}
}
public override bool Contains(Vector2 screenSpacePos) => true;
[BackgroundDependencyLoader]
private void load(ShaderManager shaders, TextureStore textures)
{

1
osu.Game/Graphics/Processing/RatioAdjust.cs
View File

@ -12,7 +12,6 @@ namespace osu.Game.Graphics.Processing
{
public RatioAdjust()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
}

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
protected override bool InternalContains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => Alpha == 1f && Text.Contains(screenSpacePos);
public override bool HandleInput => State == Visibility.Visible;
private Visibility state;

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

@ -93,7 +93,7 @@ namespace osu.Game.Graphics.UserInterface
private bool didClick; // Used for making sure that the OnMouseDown animation can call instead of OnHoverLost's when clicking
protected override bool InternalContains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => backgroundContainer.Contains(screenSpacePos);
protected override bool OnClick(Framework.Input.InputState state)
{

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

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

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

@ -171,7 +171,7 @@ namespace osu.Game.Graphics.UserInterface
}
}
protected override bool InternalContains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => IconLayer.Contains(screenSpacePos) || TextLayer.Contains(screenSpacePos);
protected override bool OnHover(InputState state)
{

1
osu.Game/OsuGameBase.cs
View File

@ -152,7 +152,6 @@ namespace osu.Game
{
new Container
{
AlwaysReceiveInput = true,
RelativeSizeAxes = Axes.Both,
Depth = float.MinValue,
Children = new Drawable[]

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()

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

@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Chat
{
set
{
sectionsFlow.Children = value;
sectionsFlow.ChildrenEnumerable = value;
foreach (ChannelSection s in sectionsFlow.Children)
{

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

@ -59,7 +59,7 @@ namespace osu.Game.Overlays
private readonly Container channelSelectionContainer;
private readonly ChannelSelectionOverlay channelSelection;
protected override bool InternalContains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => chatContainer.Contains(screenSpacePos) || channelSelection.State == Visibility.Visible && channelSelection.Contains(screenSpacePos);
public ChatOverlay()
{

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

@ -56,7 +56,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;

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>();

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

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;
});
}

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

@ -29,7 +29,7 @@ namespace osu.Game.Overlays.SearchableList
protected abstract T DefaultTab { get; }
protected virtual Drawable CreateSupplementaryControls() => null;
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || DisplayStyleControl.Dropdown.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || DisplayStyleControl.Dropdown.Contains(screenSpacePos);
protected SearchableListFilterControl()
{

1
osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
View File

@ -82,7 +82,6 @@ namespace osu.Game.Overlays.SearchableList
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
AlwaysReceiveInput = true,
Children = new Drawable[]
{
Header = CreateHeader(),

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);

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

@ -33,8 +33,6 @@ namespace osu.Game.Overlays.Toolbar
public Toolbar()
{
AlwaysReceiveInput = true;
Children = new Drawable[]
{
new ToolbarBackground(),
@ -55,7 +53,6 @@ namespace osu.Game.Overlays.Toolbar
},
new FillFlowContainer
{
AlwaysReceiveInput = true,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Direction = FillDirection.Horizontal,

2
osu.Game/Overlays/Toolbar/ToolbarUserArea.cs
View File

@ -17,8 +17,6 @@ namespace osu.Game.Overlays.Toolbar
public ToolbarUserArea()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Y;
AutoSizeAxes = Axes.X;

12
osu.Game/Rulesets/UI/Playfield.cs
View File

@ -37,8 +37,6 @@ namespace osu.Game.Rulesets.UI
/// <param name="customWidth">Whether we want our internal coordinate system to be scaled to a specified width.</param>
protected Playfield(float? customWidth = null)
{
AlwaysReceiveInput = true;
// Default height since we force relative size axes
Size = Vector2.One;
@ -50,7 +48,6 @@ namespace osu.Game.Rulesets.UI
{
content = new Container
{
AlwaysReceiveInput = true,
RelativeSizeAxes = Axes.Both,
}
}
@ -100,19 +97,10 @@ namespace osu.Game.Rulesets.UI
//dividing by the customwidth will effectively scale our content to the required container size.
protected override Vector2 DrawScale => CustomWidth.HasValue ? new Vector2(DrawSize.X / CustomWidth.Value) : base.DrawScale;
public ScaledContainer()
{
AlwaysReceiveInput = true;
}
}
public class HitObjectContainer<U> : Container<U> where U : Drawable
{
public HitObjectContainer()
{
AlwaysReceiveInput = true;
}
}
}
}

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

@ -35,7 +35,7 @@ namespace osu.Game.Screens.Menu
private readonly Key triggerKey;
private SampleChannel sampleClick;
protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public Button(string text, string internalName, FontAwesome symbol, Color4 colour, Action clickAction = null, float extraWidth = 0, Key triggerKey = Key.Unknown)
{

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

@ -57,7 +57,7 @@ namespace osu.Game.Screens.Menu
set { colourAndTriangles.Alpha = value ? 1 : 0; }
}
protected override bool InternalContains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => logoContainer.Contains(screenSpacePos);
public bool Ripple
{
@ -227,9 +227,6 @@ namespace osu.Game.Screens.Menu
{
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
if (Hovering)
sampleBeat.Play();
lastBeatIndex = beatIndex;
var beatLength = timingPoint.BeatLength;
@ -238,6 +235,9 @@ namespace osu.Game.Screens.Menu
if (beatIndex < 0) return;
if (Hovering)
sampleBeat.Play();
logoBeatContainer.ScaleTo(1 - 0.02f * amplitudeAdjust, beat_in_time, EasingTypes.Out);
using (logoBeatContainer.BeginDelayedSequence(beat_in_time))
logoBeatContainer.ScaleTo(1, beatLength * 2, EasingTypes.OutQuint);

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

@ -378,7 +378,7 @@ namespace osu.Game.Screens.Multiplayer
{
participants.Text = value.Length.ToString();
participantInfo.Participants = value;
participantsFlow.Children = value.Select(u => new UserTile(u));
participantsFlow.ChildrenEnumerable = value.Select(u => new UserTile(u));
}
private class UserTile : Container, IHasTooltip

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

@ -9,6 +9,7 @@ using osu.Framework.Input;
using osu.Framework.Configuration;
using osu.Framework.Allocation;
using osu.Game.Configuration;
using OpenTK;
namespace osu.Game.Screens.Play
{
@ -20,8 +21,6 @@ namespace osu.Game.Screens.Play
public KeyCounterCollection()
{
AlwaysReceiveInput = true;
Direction = FillDirection.Horizontal;
AutoSizeAxes = Axes.Both;
}
@ -124,11 +123,12 @@ namespace osu.Game.Screens.Play
public Receptor(KeyCounterCollection target)
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
this.target = target;
}
public override bool Contains(Vector2 screenSpacePos) => true;
public override bool HandleInput => true;
protected override bool OnKeyDown(InputState state, KeyDownEventArgs args) => target.Children.Any(c => c.TriggerOnKeyDown(state, args));

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

@ -3,6 +3,7 @@
using osu.Framework.Input;
using OpenTK.Input;
using OpenTK;
namespace osu.Game.Screens.Play
{
@ -12,10 +13,11 @@ namespace osu.Game.Screens.Play
public KeyCounterMouse(MouseButton button) : base(getStringRepresentation(button))
{
AlwaysReceiveInput = true;
Button = button;
}
public override bool Contains(Vector2 screenSpacePos) => true;
private static string getStringRepresentation(MouseButton button)
{
switch (button)

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

@ -186,7 +186,6 @@ namespace osu.Game.Screens.Play
protected MenuOverlay()
{
AlwaysReceiveInput = true;
RelativeSizeAxes = Axes.Both;
}

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

@ -34,8 +34,6 @@ namespace osu.Game.Screens.Play
public SkipButton(double startTime)
{
AlwaysReceiveInput = true;
this.startTime = startTime;
RelativePositionAxes = Axes.Both;

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()

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",

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

@ -67,7 +67,7 @@ namespace osu.Game.Screens.Select
private readonly SearchTextBox searchTextBox;
protected override bool InternalContains(Vector2 screenSpacePos) => base.InternalContains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => base.Contains(screenSpacePos) || groupTabs.Contains(screenSpacePos) || sortTabs.Contains(screenSpacePos);
public FilterControl()
{
@ -82,7 +82,6 @@ namespace osu.Game.Screens.Select
new Container
{
Padding = new MarginPadding(20),
AlwaysReceiveInput = true,
RelativeSizeAxes = Axes.Both,
Width = 0.5f,
Anchor = Anchor.TopRight,
@ -109,7 +108,6 @@ namespace osu.Game.Screens.Select
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
AlwaysReceiveInput = true,
Children = new Drawable[]
{
groupTabs = new OsuTabControl<GroupMode>

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

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

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

@ -83,7 +83,7 @@ namespace osu.Game.Screens.Select.Options
return false;
}
protected override bool InternalContains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public override bool Contains(Vector2 screenSpacePos) => box.Contains(screenSpacePos);
public BeatmapOptionsButton()
{

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;