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

Metrics adjust and labelling

Browse Source
This commit is contained in:
Dean Herbert 2022-05-20 16:25:24 +09:00
parent cf1ef28f72
commit 79878a4ec2
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
osu.Game/Screens/Edit/Timing/TapTimingControl.cs
View File

@ -116,26 +116,27 @@ namespace osu.Game.Screens.Edit.Timing
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
const float taper = 30;
const float swing_vertical_offset = -23;
var triangleSize = new Vector2(90, 120 + taper);
Margin = new MarginPadding(10); Margin = new MarginPadding(10);
const float taper = 10;
var triangleSize = new Vector2(80, 120);
AutoSizeAxes = Axes.Both; AutoSizeAxes = Axes.Both;
const float stick_vertical_offset = -23;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Container new Container
{ {
Name = @"Taper adjust",
Masking = true, Masking = true,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Size = new Vector2(triangleSize.X * 1.2f, triangleSize.Y - taper), Size = new Vector2(triangleSize.X * 1.2f, triangleSize.Y - taper),
Child = new Triangle Child = new Triangle
{ {
Name = @"Main body",
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Size = triangleSize, Size = triangleSize,
@ -144,15 +145,17 @@ namespace osu.Game.Screens.Edit.Timing
}, },
swing = new Container swing = new Container
{ {
Name = @"Swing",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Y = stick_vertical_offset, Y = swing_vertical_offset,
Height = 0.8f, Height = 0.80f,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Children = new[] Children = new[]
{ {
stick = new Circle stick = new Circle
{ {
Name = @"Stick",
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Colour = overlayColourProvider.Colour2, Colour = overlayColourProvider.Colour2,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
@ -161,6 +164,7 @@ namespace osu.Game.Screens.Edit.Timing
}, },
weight = new Container weight = new Container
{ {
Name = @"Weight",
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = overlayColourProvider.Colour1, Colour = overlayColourProvider.Colour1,
@ -186,7 +190,8 @@ namespace osu.Game.Screens.Edit.Timing
}, },
new Circle new Circle
{ {
Y = stick_vertical_offset, Name = @"Swing connection point",
Y = swing_vertical_offset,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = overlayColourProvider.Colour0, Colour = overlayColourProvider.Colour0,
@ -194,6 +199,7 @@ namespace osu.Game.Screens.Edit.Timing
}, },
new Container new Container
{ {
Name = @"Lower cover",
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
@ -213,6 +219,7 @@ namespace osu.Game.Screens.Edit.Timing
}, },
bpm = new OsuSpriteText bpm = new OsuSpriteText
{ {
Name = @"BPM display",
Colour = overlayColourProvider.Content1, Colour = overlayColourProvider.Content1,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,