sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Add taper and more correctly shaped weight

Browse Source
This commit is contained in:
Dean Herbert 2022-05-20 16:22:16 +09:00
parent 42179568f3
commit cf1ef28f72
1 changed files with 70 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@ using osu.Game.Graphics.Sprites;
using osu.Game.Graphics.UserInterfaceV2; using osu.Game.Graphics.UserInterfaceV2;
using osu.Game.Overlays; using osu.Game.Overlays;
using osuTK; using osuTK;
using osuTK.Graphics;
namespace osu.Game.Screens.Edit.Timing namespace osu.Game.Screens.Edit.Timing
{ {
@ -105,9 +104,11 @@ namespace osu.Game.Screens.Edit.Timing
private class Metronome : BeatSyncedContainer private class Metronome : BeatSyncedContainer
{ {
private Container swing; private Container swing;
private Box weight;
private OsuSpriteText bpm; private OsuSpriteText bpm;
private Box stick;
private Drawable weight;
private Drawable stick;
[Resolved] [Resolved]
private OverlayColourProvider overlayColourProvider { get; set; } private OverlayColourProvider overlayColourProvider { get; set; }
@ -116,33 +117,41 @@ namespace osu.Game.Screens.Edit.Timing
private void load() private void load()
{ {
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 Triangle new Container
{ {
Anchor = Anchor.Centre, Masking = true,
Origin = Anchor.Centre,
Size = new Vector2(80, 120),
Colour = overlayColourProvider.Background2,
},
bpm = new OsuSpriteText
{
Colour = overlayColourProvider.Content1,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Size = new Vector2(triangleSize.X * 1.2f, triangleSize.Y - taper),
Child = new Triangle
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Size = triangleSize,
Colour = overlayColourProvider.Background3,
},
}, },
swing = new Container swing = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Y = -25, Y = stick_vertical_offset,
Height = 0.8f, Height = 0.8f,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Children = new Drawable[] Children = new[]
{ {
stick = new Box stick = new Circle
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Colour = overlayColourProvider.Colour2, Colour = overlayColourProvider.Colour2,
@ -150,24 +159,64 @@ namespace osu.Game.Screens.Edit.Timing
Origin = Anchor.BottomCentre, Origin = Anchor.BottomCentre,
Width = 4, Width = 4,
}, },
weight = new Box weight = new Container
{ {
Anchor = Anchor.TopCentre, Anchor = Anchor.TopCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = overlayColourProvider.Colour1, Colour = overlayColourProvider.Colour1,
Size = new Vector2(15), Size = new Vector2(10),
Rotation = 180,
RelativePositionAxes = Axes.Y, RelativePositionAxes = Axes.Y,
Y = 0.4f, Y = 0.4f,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(0.2f, 0),
},
new Box
{
RelativeSizeAxes = Axes.Both,
Shear = new Vector2(-0.2f, 0),
},
}
}, },
} }
}, },
new Circle new Circle
{ {
Y = -25, Y = stick_vertical_offset,
Anchor = Anchor.BottomCentre, Anchor = Anchor.BottomCentre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Colour = overlayColourProvider.Colour0, Colour = overlayColourProvider.Colour0,
Size = new Vector2(10) Size = new Vector2(8)
},
new Container
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
RelativeSizeAxes = Axes.Both,
Masking = true,
Height = 0.3f,
Children = new Drawable[]
{
new Triangle
{
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Size = triangleSize,
Colour = overlayColourProvider.Background2,
Alpha = 0.8f
},
}
},
bpm = new OsuSpriteText
{
Colour = overlayColourProvider.Content1,
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,
Y = -3,
}, },
}; };
} }
@ -194,7 +243,7 @@ namespace osu.Game.Screens.Edit.Timing
bpmRatio = (float)Interpolation.ApplyEasing(Easing.OutQuad, Math.Clamp((timingPoint.BPM - 30) / 480, 0, 1)); bpmRatio = (float)Interpolation.ApplyEasing(Easing.OutQuad, Math.Clamp((timingPoint.BPM - 30) / 480, 0, 1));
weight.MoveToY((float)Interpolation.Lerp(0, 0.9f, bpmRatio), 600, Easing.OutQuint); weight.MoveToY((float)Interpolation.Lerp(0.07f, 0.9f, bpmRatio), 600, Easing.OutQuint);
} }
if (BeatSyncClock?.IsRunning != true && isSwinging) if (BeatSyncClock?.IsRunning != true && isSwinging)
@ -215,7 +264,7 @@ namespace osu.Game.Screens.Edit.Timing
{ {
base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes); base.OnNewBeat(beatIndex, timingPoint, effectPoint, amplitudes);
float angle = (float)Interpolation.Lerp(25, 4, bpmRatio); float angle = (float)Interpolation.Lerp(30, 5, bpmRatio);
if (!IsBeatSyncedWithTrack) if (!IsBeatSyncedWithTrack)
return; return;