h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 19:42:55 +08:00
Code Issues Releases Wiki Activity

Add some simple border styles

Browse Source
This commit is contained in:
Dean Herbert 2020-10-20 13:59:03 +09:00
parent 7c388f1132
commit 267b399f9f
6 changed files with 156 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game.Rulesets.Osu/Configuration/OsuRulesetConfigManager.cs
View File

@ -3,6 +3,7 @@
using osu.Game.Configuration;
using osu.Game.Rulesets.Configuration;
using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Osu.Configuration
{
@ -19,7 +20,7 @@ namespace osu.Game.Rulesets.Osu.Configuration
Set(OsuRulesetSetting.SnakingInSliders, true);
Set(OsuRulesetSetting.SnakingOutSliders, true);
Set(OsuRulesetSetting.ShowCursorTrail, true);
Set(OsuRulesetSetting.ShowPlayfieldBorder, false);
Set(OsuRulesetSetting.PlayfieldBorderStyle, PlayfieldBorderStyle.None);
}
}
@ -28,6 +29,6 @@ namespace osu.Game.Rulesets.Osu.Configuration
SnakingInSliders,
SnakingOutSliders,
ShowCursorTrail,
ShowPlayfieldBorder,
PlayfieldBorderStyle,
}
}

14
osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs
View File

@ -56,12 +56,18 @@ namespace osu.Game.Rulesets.Osu.Edit
[BackgroundDependencyLoader]
private void load()
{
LayerBelowRuleset.Add(new PlayfieldBorder
LayerBelowRuleset.AddRange(new Drawable[]
{
RelativeSizeAxes = Axes.Both,
State = { Value = Visibility.Visible }
new PlayfieldBorder
{
RelativeSizeAxes = Axes.Both,
PlayfieldBorderStyle = { Value = PlayfieldBorderStyle.Corners }
},
distanceSnapGridContainer = new Container
{
RelativeSizeAxes = Axes.Both
}
});
LayerBelowRuleset.Add(distanceSnapGridContainer = new Container { RelativeSizeAxes = Axes.Both });
selectedHitObjects = EditorBeatmap.SelectedHitObjects.GetBoundCopy();
selectedHitObjects.CollectionChanged += (_, __) => updateDistanceSnapGrid();

8
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Osu.UI
protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
private readonly Bindable<bool> showPlayfieldBorder = new BindableBool();
private readonly Bindable<bool> playfieldBorderStyle = new BindableBool();
private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
@ -90,13 +90,9 @@ namespace osu.Game.Rulesets.Osu.UI
[BackgroundDependencyLoader(true)]
private void load(OsuRulesetConfigManager config)
{
config?.BindWith(OsuRulesetSetting.ShowPlayfieldBorder, showPlayfieldBorder);
showPlayfieldBorder.BindValueChanged(updateBorderVisibility, true);
config?.BindWith(OsuRulesetSetting.PlayfieldBorderStyle, playfieldBorder.PlayfieldBorderStyle);
}
private void updateBorderVisibility(ValueChangedEvent<bool> settingChange)
=> playfieldBorder.State.Value = settingChange.NewValue ? Visibility.Visible : Visibility.Hidden;
public override void Add(DrawableHitObject h)
{
h.OnNewResult += onNewResult;

7
osu.Game.Rulesets.Osu/UI/OsuSettingsSubsection.cs
View File

@ -5,6 +5,7 @@ using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Game.Overlays.Settings;
using osu.Game.Rulesets.Osu.Configuration;
using osu.Game.Rulesets.UI;
namespace osu.Game.Rulesets.Osu.UI
{
@ -39,10 +40,10 @@ namespace osu.Game.Rulesets.Osu.UI
LabelText = "Cursor trail",
Current = config.GetBindable<bool>(OsuRulesetSetting.ShowCursorTrail)
},
new SettingsCheckbox
new SettingsEnumDropdown<PlayfieldBorderStyle>
{
LabelText = "Show playfield border",
Current = config.GetBindable<bool>(OsuRulesetSetting.ShowPlayfieldBorder),
LabelText = "Playfield border style",
Current = config.GetBindable<PlayfieldBorderStyle>(OsuRulesetSetting.PlayfieldBorderStyle),
},
};
}

137
osu.Game/Rulesets/UI/PlayfieldBorder.cs
View File

@ -1,9 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.Linq;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osuTK;
using osuTK.Graphics;
namespace osu.Game.Rulesets.UI
@ -11,27 +15,136 @@ namespace osu.Game.Rulesets.UI
/// <summary>
/// Provides a border around the playfield.
/// </summary>
public class PlayfieldBorder : VisibilityContainer
public class PlayfieldBorder : CompositeDrawable
{
private const int fade_duration = 200;
public Bindable<PlayfieldBorderStyle> PlayfieldBorderStyle { get; } = new Bindable<PlayfieldBorderStyle>();
private const int fade_duration = 500;
private const float corner_length = 0.05f;
private const float corner_thickness = 2;
public PlayfieldBorder()
{
RelativeSizeAxes = Axes.Both;
Masking = true;
BorderColour = Color4.White;
BorderThickness = 2;
InternalChild = new Box
InternalChildren = new Drawable[]
{
RelativeSizeAxes = Axes.Both,
Alpha = 0,
AlwaysPresent = true
new Line(Direction.Horizontal)
{
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
},
new Line(Direction.Horizontal)
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
},
new Line(Direction.Horizontal)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
new Line(Direction.Horizontal)
{
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
},
new Line(Direction.Vertical)
{
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
},
new Line(Direction.Vertical)
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
},
new Line(Direction.Vertical)
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
},
new Line(Direction.Vertical)
{
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
},
};
}
protected override void PopIn() => this.FadeIn(fade_duration, Easing.OutQuint);
protected override void PopOut() => this.FadeOut(fade_duration, Easing.OutQuint);
protected override void LoadComplete()
{
base.LoadComplete();
PlayfieldBorderStyle.BindValueChanged(updateStyle, true);
}
private void updateStyle(ValueChangedEvent<PlayfieldBorderStyle> style)
{
switch (style.NewValue)
{
case UI.PlayfieldBorderStyle.None:
this.FadeOut(fade_duration, Easing.OutQuint);
foreach (var line in InternalChildren.OfType<Line>())
line.TweenLength(0);
break;
case UI.PlayfieldBorderStyle.Corners:
this.FadeIn(fade_duration, Easing.OutQuint);
foreach (var line in InternalChildren.OfType<Line>())
line.TweenLength(corner_length);
break;
case UI.PlayfieldBorderStyle.Full:
this.FadeIn(fade_duration, Easing.OutQuint);
foreach (var line in InternalChildren.OfType<Line>())
line.TweenLength(0.5f);
break;
}
}
private class Line : Box
{
private readonly Direction direction;
public Line(Direction direction)
{
this.direction = direction;
Colour = Color4.White;
// starting in relative avoids the framework thinking it knows best and setting the width to 1 initially.
switch (direction)
{
case Direction.Horizontal:
RelativeSizeAxes = Axes.X;
Size = new Vector2(0, corner_thickness);
break;
case Direction.Vertical:
RelativeSizeAxes = Axes.Y;
Size = new Vector2(corner_thickness, 0);
break;
}
}
public void TweenLength(float value)
{
switch (direction)
{
case Direction.Horizontal:
this.ResizeWidthTo(value, fade_duration, Easing.OutQuint);
break;
case Direction.Vertical:
this.ResizeHeightTo(value, fade_duration, Easing.OutQuint);
break;
}
}
}
}
}

12
osu.Game/Rulesets/UI/PlayfieldBorderStyle.cs Normal file
View File

@ -0,0 +1,12 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Rulesets.UI
{
public enum PlayfieldBorderStyle
{
None,
Corners,
Full
}
}