RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into timingchange-rework 

# Conflicts:
#	osu-framework
This commit is contained in:
smoogipooo 2017-06-12 13:09:02 +09:00
parent de35ea22b1 8bd9c112ba
commit 419682b740
50 changed files with 105 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 9131d8a75d784c42649fc04ad16ee609fe81748f
Subproject commit 83ee0bf59995a4399dd7c2ee676cdac6ac1669f8

2
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
View File

@ -70,7 +70,7 @@ public override Color4 AccentColour
{
base.AccentColour = value;
glowContainer.EdgeEffect = new EdgeEffect
glowContainer.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 2f,

4
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -176,14 +176,14 @@ public Color4 AccentColour
background.Colour = accentColour;
hitTargetBar.EdgeEffect = new EdgeEffect
hitTargetBar.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = accentColour.Opacity(0.5f),
};
keyIcon.EdgeEffect = new EdgeEffect
keyIcon.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 5,

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

@ -21,7 +21,7 @@ public FollowPoint()
Masking = true;
AutoSizeAxes = Axes.Both;
CornerRadius = width / 2;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = Color4.White.Opacity(0.2f),

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

@ -31,7 +31,7 @@ public NumberPiece()
{
Masking = true,
Origin = Anchor.Centre,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 60,

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

@ -25,7 +25,7 @@ public Color4 AccentColour
{
Disc.Colour = value;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Hollow = true,
Type = EdgeEffectType.Glow,

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

@ -27,7 +27,7 @@ public SpinnerTicks()
{
Colour = Color4.Black,
Alpha = 0.4f,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 10,

2
osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
View File

@ -148,7 +148,7 @@ protected override void Update()
private void resetEdgeEffects()
{
background.EdgeEffect = new EdgeEffect
background.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = AccentColour.Opacity(KiaiMode ? edge_alpha_kiai : 1f),

2
osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
View File

@ -47,7 +47,7 @@ public KiaiHitExplosion(TaikoJudgement judgement, bool isRim)
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = isRim ? colours.BlueDarker : colours.PinkDarker,

2
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -68,7 +68,7 @@ public TaikoPlayfield()
RelativeSizeAxes = Axes.Both,
BorderThickness = 2,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),

4
osu.Game/Beatmaps/Drawables/Panel.cs
View File

@ -88,7 +88,7 @@ public PanelSelectedState State
protected virtual void Selected()
{
nestedContainer.BorderThickness = 2.5f;
nestedContainer.EdgeEffect = new EdgeEffect
nestedContainer.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150),
@ -100,7 +100,7 @@ protected virtual void Selected()
protected virtual void Deselected()
{
nestedContainer.BorderThickness = 0;
nestedContainer.EdgeEffect = new EdgeEffect
nestedContainer.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Offset = new Vector2(1),

2
osu.Game/Graphics/Backgrounds/Triangles.cs
View File

@ -7,7 +7,6 @@
using OpenTK;
using OpenTK.Graphics;
using System;
using osu.Framework.Graphics.OpenGL;
using osu.Framework.Graphics.Shaders;
using osu.Framework.Graphics.Textures;
using OpenTK.Graphics.ES30;
@ -16,6 +15,7 @@
using osu.Framework.Allocation;
using System.Collections.Generic;
using osu.Framework.Graphics.Batches;
using osu.Framework.Graphics.OpenGL.Vertices;
using osu.Framework.Lists;
namespace osu.Game.Graphics.Backgrounds

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

@ -8,13 +8,13 @@
using osu.Framework.Input;
using OpenTK;
using System;
using osu.Framework.Graphics.OpenGL;
using osu.Framework.Graphics.OpenGL.Buffers;
using OpenTK.Graphics.ES30;
using osu.Framework.Graphics.Primitives;
using osu.Framework.Graphics.Colour;
using osu.Framework.Timing;
using System.Diagnostics;
using osu.Framework.Graphics.OpenGL.Vertices;
namespace osu.Game.Graphics.Cursor
{

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

@ -67,7 +67,7 @@ private void load(OsuConfigManager config, OsuGameBase game)
Masking = true,
BorderThickness = Size.X / 6,
BorderColour = Color4.White,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Pink.Opacity(0.5f),

129
osu.Game/Graphics/Cursor/OsuCursorContainer.cs
View File

@ -1,129 +0,0 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using OpenTK;
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transforms;
using osu.Framework.Input;
using osu.Game.Configuration;
using System;
namespace osu.Game.Graphics.Cursor
{
public class OsuCursorContainer : CursorContainer
{
protected override Drawable CreateCursor() => new OsuCursor();
public OsuCursorContainer()
{
Add(new CursorTrail { Depth = 1 });
}
protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
{
ActiveCursor.Scale = new Vector2(1);
ActiveCursor.ScaleTo(1.2f, 100, EasingTypes.OutQuad);
return base.OnMouseDown(state, args);
}
protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
{
if (!state.Mouse.HasMainButtonPressed)
ActiveCursor.ScaleTo(1, 200, EasingTypes.OutQuad);
return base.OnMouseUp(state, args);
}
public class OsuCursor : Container
{
private Container cursorContainer;
private Bindable<double> cursorScale;
public OsuCursor()
{
Origin = Anchor.Centre;
Size = new Vector2(42);
}
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
cursorScale = config.GetBindable<double>(OsuConfig.CursorSize);
Children = new Drawable[]
{
cursorContainer = new CircularContainer
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Scale = new Vector2((float)cursorScale),
Masking = true,
BorderThickness = Size.X / 6,
BorderColour = Color4.White,
EdgeEffect = new EdgeEffect {
Type = EdgeEffectType.Shadow,
Colour = Color4.Pink.Opacity(0.5f),
Radius = 5,
},
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true,
},
new CircularContainer
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Masking = true,
BorderThickness = Size.X / 3,
BorderColour = Color4.White.Opacity(0.5f),
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true,
},
},
},
new CircularContainer
{
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.1f),
Masking = true,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White,
},
},
},
}
},
};
cursorScale.ValueChanged += scaleChanged;
}
private void scaleChanged(object sender, EventArgs e)
{
cursorContainer.Scale = new Vector2((float)cursorScale);
}
}
}
}

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

@ -52,7 +52,7 @@ public OsuTooltip()
CornerRadius = 5;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),

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

@ -222,7 +222,7 @@ public DialogButton()
Width = 0.8f,
Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),

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

@ -50,7 +50,7 @@ public IconButton()
CornerRadius = 5,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = Color4.Black.Opacity(0.04f),
Type = EdgeEffectType.Shadow,

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

@ -56,7 +56,7 @@ private void load(OsuColour colours)
GlowingAccentColour = colours.PinkLighter;
GlowColour = colours.PinkDarker;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = GlowColour,
Type = EdgeEffectType.Glow,

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

@ -79,18 +79,21 @@ public TwoLayerButton()
Width = 0.4f,
Children = new Drawable[]
{
new Container {
new Container
{
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(shear, 0),
Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect {
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),
Offset = new Vector2(2, 0),
Radius = 2,
},
Children = new[] {
Children = new[]
{
IconLayer = new Box
{
RelativeSizeAxes = Axes.Both,
@ -113,18 +116,21 @@ public TwoLayerButton()
Width = 0.6f,
Children = new Drawable[]
{
new Container {
new Container
{
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(shear, 0),
Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect {
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),
Offset = new Vector2(2, 0),
Radius = 2,
},
Children = new[] {
Children = new[]
{
TextLayer = new Box
{
Origin = Anchor.TopLeft,

18
osu.Game/OsuGame.cs
View File

@ -77,8 +77,10 @@ public OsuGame(string[] args = null)
public void ToggleDirect() => direct.ToggleVisibility();
[BackgroundDependencyLoader]
private void load()
private void load(FrameworkConfigManager frameworkConfig)
{
this.frameworkConfig = frameworkConfig;
if (!Host.IsPrimaryInstance)
{
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
@ -259,6 +261,19 @@ private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
{
switch (args.Key)
{
case Key.R:
if (state.Keyboard.AltPressed)
{
var sensitivity = frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity);
sensitivity.Disabled = false;
sensitivity.Value = 1;
sensitivity.Disabled = true;
frameworkConfig.Set(FrameworkSetting.ActiveInputHandlers, string.Empty);
return true;
}
break;
case Key.T:
Toolbar.ToggleVisibility();
return true;
@ -284,6 +299,7 @@ private bool globalHotkeyPressed(InputState state, KeyDownEventArgs args)
private Container overlayContent;
private OsuScreen currentScreen;
private FrameworkConfigManager frameworkConfig;
private void screenChanged(Screen newScreen)
{

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

@ -141,7 +141,7 @@ public ChannelTabItem(Channel value) : base(value)
Shear = new Vector2(shear_width / ChatOverlay.TAB_AREA_HEIGHT, 0);
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 10,

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

@ -145,7 +145,7 @@ public PopupDialog()
{
RelativeSizeAxes = Axes.Both,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.5f),

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

@ -30,7 +30,7 @@ public DirectGridPanel(BeatmapSetInfo beatmap) : base(beatmap)
CornerRadius = 4;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Offset = new Vector2(0f, 1f),

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

@ -31,7 +31,7 @@ public DirectListPanel(BeatmapSetInfo beatmap) : base(beatmap)
Height = height;
CornerRadius = 5;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Offset = new Vector2(0f, 1f),

4
osu.Game/Overlays/Music/CollectionsDropdown.cs
View File

@ -39,7 +39,7 @@ public CollectionsHeader()
Icon.TextSize = 14;
Icon.Margin = new MarginPadding(0);
Foreground.Padding = new MarginPadding { Top = 4, Bottom = 4, Left = 10, Right = 10 };
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.3f),
@ -60,7 +60,7 @@ private void load(OsuColour colours)
public CollectionsMenu()
{
CornerRadius = 5;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.3f),

2
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -52,7 +52,7 @@ private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours,
RelativeSizeAxes = Axes.Both,
CornerRadius = 5,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),

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

@ -106,7 +106,7 @@ private void load(OsuGameBase game, OsuColour colours, LocalisationEngine locali
Height = player_height,
Masking = true,
CornerRadius = 5,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),

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

@ -238,7 +238,7 @@ public bool Pulsate
set
{
base.Colour = value;
pulsateLayer.EdgeEffect = new EdgeEffect
pulsateLayer.EdgeEffect = new EdgeEffectParameters
{
Colour = ((Color4)value).Opacity(0.5f), //todo: avoid cast
Type = EdgeEffectType.Glow,

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

@ -125,6 +125,14 @@ private void load(FrameworkConfigManager frameworkConfig)
trackSetting(frameworkConfig.GetBindable<int>(FrameworkSetting.Width), v => displayResolution());
trackSetting(frameworkConfig.GetBindable<int>(FrameworkSetting.Height), v => displayResolution());
trackSetting(frameworkConfig.GetBindable<double>(FrameworkSetting.CursorSensitivity), v => display(v, "Cursor Sensitivity", v.ToString(@"0.##x"), "Ctrl+Alt+R to reset"));
trackSetting(frameworkConfig.GetBindable<string>(FrameworkSetting.ActiveInputHandlers),
delegate (string v)
{
bool raw = v.Contains("Raw");
display(raw, "Raw Input", raw ? "enabled" : "disabled", "Ctrl+Alt+R to reset");
});
trackSetting(frameworkConfig.GetBindable<WindowMode>(FrameworkSetting.WindowMode), v => display(v, "Screen Mode", v.ToString(), "Alt+Enter"));
}
@ -245,7 +253,7 @@ private void load(OsuColour colours)
Masking = true;
CornerRadius = 3;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = colours.BlueDark.Opacity(glow_strength),
Type = EdgeEffectType.Glow,

4
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -290,7 +290,7 @@ public UserDropdownHeader()
Margin = new MarginPadding { Bottom = 5 };
Masking = true;
CornerRadius = 5;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),
@ -326,7 +326,7 @@ public UserDropdownMenu()
CornerRadius = 5;
ItemsContainer.Padding = new MarginPadding(0);
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),

15
osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
View File

@ -21,9 +21,6 @@ public class MouseSettings : SettingsSubsection
[BackgroundDependencyLoader]
private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
{
activeInputHandlers = config.GetBindable<string>(FrameworkSetting.ActiveInputHandlers);
rawInputToggle.Value = activeInputHandlers.Value.Contains("Raw");
Children = new Drawable[]
{
new SettingsCheckbox
@ -62,11 +59,17 @@ private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
activeInputHandlers.Value = enabled ?
activeInputHandlers.Value.Replace(standard_mouse_handler, raw_mouse_handler) :
activeInputHandlers.Value.Replace(raw_mouse_handler, standard_mouse_handler);
sensitivity.Bindable.Disabled = !enabled;
};
rawInputToggle.TriggerChange();
activeInputHandlers = config.GetBindable<string>(FrameworkSetting.ActiveInputHandlers);
activeInputHandlers.ValueChanged += handlers =>
{
bool raw = handlers.Contains("Raw");
rawInputToggle.Value = raw;
sensitivity.Bindable.Disabled = !raw;
};
activeInputHandlers.TriggerChange();
}
private class SensitivitySetting : SettingsSlider<double, SensitivitySlider>

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

@ -172,7 +172,7 @@ public OpaqueBackground()
RelativeSizeAxes = Axes.Both;
Masking = true;
MaskingSmoothness = 0;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),

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

@ -33,7 +33,7 @@ public bool Active
{
DrawableIcon.Colour = Color4.White;
DrawableIcon.Masking = true;
DrawableIcon.EdgeEffect = new EdgeEffect
DrawableIcon.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = new Color4(255, 194, 224, 100),

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

@ -46,7 +46,7 @@ public ToolbarModeSelector()
Anchor = Anchor.BottomLeft,
Origin = Anchor.TopLeft,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = new Color4(255, 194, 224, 100),

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

@ -31,7 +31,7 @@ public ToolbarUserButton()
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
CornerRadius = 4,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 4,

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

@ -173,7 +173,7 @@ public Wave()
RelativeSizeAxes = Axes.X;
Width = 1.5f;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(50),

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

@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Timing
/// </para>
///
/// <para>
/// This container will always be relatively-sized and positioned to its parent through the use of <see cref="Drawable.RelativeSizeAxes"/>
/// and <see cref="Drawable.RelativePositionAxes"/> such that the parent can utilise <see cref="Container{T}.RelativeChildSize"/> and
/// <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets to this collection of hit objects.
/// This container is and must always be relatively-sized and positioned to its such that the parent can utilise
/// <see cref="Container{T}.RelativeChildSize"/> and <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets
/// to this collection of hit objects.
/// </para>
/// </summary>
public abstract class DrawableTimingSection : Container<DrawableHitObject>
@ -57,6 +57,8 @@ protected DrawableTimingSection(Axes autoSizingAxes)
{
this.autoSizingAxes = autoSizingAxes;
RelativePositionAxes = Axes.Both;
// We need a default size since RelativeSizeAxes is overridden
Size = Vector2.One;
}
@ -69,12 +71,6 @@ public override Axes RelativeSizeAxes
set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-sized."); }
}
public override Axes RelativePositionAxes
{
get { return Axes.Both; }
set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-positioned."); }
}
public override void InvalidateFromChild(Invalidation invalidation)
{
// We only want to re-compute our size when a child's size or position has changed

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

@ -54,7 +54,7 @@ public Button(string text, string internalName, FontAwesome symbol, Color4 colou
{
Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),

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

@ -47,7 +47,7 @@ public DrawableRoom(Room room)
Height = height;
CornerRadius = 5;
Masking = true;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(40),

2
osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
View File

@ -57,7 +57,7 @@ public Color4 GlowColour
return;
glowColour = value;
fill.EdgeEffect = new EdgeEffect
fill.EdgeEffect = new EdgeEffectParameters
{
Colour = glowColour.Opacity(base_glow_opacity),
Radius = 8,

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

@ -164,7 +164,7 @@ private void load(OsuColour colours)
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Vertical,
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.6f),

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

@ -60,7 +60,7 @@ private void load(OsuColour colours)
activeColour = colours.PinkDarker;
inactiveColour = OsuColour.Gray(0.8f);
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = Color4.Black.Opacity(0.4f),
Type = EdgeEffectType.Shadow,

4
osu.Game/Screens/Ranking/Results.cs
View File

@ -134,7 +134,7 @@ private void load(OsuColour colours)
circleOuter = new CircularContainer
{
Size = new Vector2(circle_outer_scale),
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = Color4.Black.Opacity(0.4f),
Type = EdgeEffectType.Shadow,
@ -225,7 +225,7 @@ private void load(OsuColour colours)
circleInner = new CircularContainer
{
Size = new Vector2(0.6f),
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = Color4.Black.Opacity(0.4f),
Type = EdgeEffectType.Shadow,

4
osu.Game/Screens/Ranking/ResultsPage.cs
View File

@ -50,7 +50,7 @@ private void load(OsuColour colours)
},
new CircularContainer
{
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = colours.GrayF.Opacity(0.8f),
Type = EdgeEffectType.Shadow,
@ -74,7 +74,7 @@ private void load(OsuColour colours)
},
content = new CircularContainer
{
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Colour = Color4.Black.Opacity(0.2f),
Type = EdgeEffectType.Shadow,

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

@ -36,7 +36,7 @@ public BeatmapInfoWedge()
Masking = true;
BorderColour = new Color4(221, 255, 255, 255);
BorderThickness = 2.5f;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Colour = new Color4(130, 204, 255, 150),

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

@ -147,7 +147,7 @@ public LeaderboardScore(Score score, int rank)
CornerRadius = corner_radius,
Masking = true,
OnLoadComplete = d => d.FadeInFromZero(200),
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Radius = 1,

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

@ -99,7 +99,7 @@ public BeatmapOptionsButton()
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(0.2f, 0f),
Masking = true,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f),

4
osu.Game/Users/UserPanel.cs
View File

@ -34,7 +34,7 @@ public UserPanel(User user)
Height = height - status_height;
Masking = true;
CornerRadius = 5;
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),
@ -68,7 +68,7 @@ public UserPanel(User user)
User = user,
Masking = true,
CornerRadius = 5,
EdgeEffect = new EdgeEffect
EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.25f),

5
osu.Game/osu.Game.csproj
View File

@ -43,7 +43,8 @@
<HintPath>$(SolutionDir)\packages\ppy.OpenTK.2.0.50727.1341\lib\net45\OpenTK.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.15.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages\sharpcompress.0.15.2')" >$(SolutionDir)\packages\sharpcompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
<HintPath Condition="Exists('$(SolutionDir)\packages\SharpCompress.0.15.2')" >$(SolutionDir)\packages\SharpCompress.0.15.2\lib\net45\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="SQLite.Net, Version=3.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\SQLite.Net.Core-PCL.3.1.1\lib\portable-win8+net45+wp8+wpa81+MonoAndroid1+MonoTouch1\SQLite.Net.dll</HintPath>
@ -508,4 +509,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>