h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 03:22:54 +08:00
Code Issues Releases Wiki Activity

New audio feedback for metronome

Browse Source
This commit is contained in:
Jamie Taylor 2022-06-17 16:56:09 +09:00
parent ea191da496
commit 1f78a4fadd
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game/Screens/Edit/Timing/MetronomeDisplay.cs
View File

@ -33,7 +33,9 @@ namespace osu.Game.Screens.Edit.Timing
private IAdjustableClock metronomeClock; private IAdjustableClock metronomeClock;
private Sample clunk; private Sample tick;
private Sample tickDownbeat;
private Sample latch;
[Resolved] [Resolved]
private OverlayColourProvider overlayColourProvider { get; set; } private OverlayColourProvider overlayColourProvider { get; set; }
@ -43,7 +45,9 @@ namespace osu.Game.Screens.Edit.Timing
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {
clunk = audio.Samples.Get(@"Multiplayer/countdown-tick"); tick = audio.Samples.Get(@"UI/metronome-tick");
tickDownbeat = audio.Samples.Get(@"UI/metronome-tick-downbeat");
latch = audio.Samples.Get(@"UI/metronome-latch");
const float taper = 25; const float taper = 25;
const float swing_vertical_offset = -23; const float swing_vertical_offset = -23;
@ -248,14 +252,27 @@ namespace osu.Game.Screens.Edit.Timing
if (BeatSyncSource.Clock?.IsRunning != true && isSwinging) if (BeatSyncSource.Clock?.IsRunning != true && isSwinging)
{ {
swing.ClearTransforms(true); swing.ClearTransforms(true);
stick.FadeColour(overlayColourProvider.Colour2, 1000, Easing.OutQuint);
isSwinging = false;
// instantly latch if pendulum arm is close enough to center (to prevent awkward delayed playback of latch sound)
if (Precision.AlmostEquals(swing.Rotation, 0, 1))
{
swing.RotateTo(0);
latch?.Play();
return;
}
using (swing.BeginDelayedSequence(350)) using (swing.BeginDelayedSequence(350))
{ {
swing.RotateTo(0, 1000, Easing.OutQuint); swing.RotateTo(0, 1000, Easing.OutQuint);
stick.FadeColour(overlayColourProvider.Colour2, 1000, Easing.OutQuint); swing.Delay(250).Schedule(() =>
{
// prevent playing latch sound if metronome has started back up again
if (!isSwinging)
latch?.Play();
});
} }
isSwinging = false;
} }
} }
@ -286,13 +303,13 @@ namespace osu.Game.Screens.Edit.Timing
if (!EnableClicking) if (!EnableClicking)
return; return;
var channel = clunk?.GetChannel(); var channel = beatIndex % timingPoint.TimeSignature.Numerator == 0 ? tickDownbeat?.GetChannel() : tick?.GetChannel();
if (channel == null)
return;
if (channel != null)
{
channel.Frequency.Value = RNG.NextDouble(0.98f, 1.02f); channel.Frequency.Value = RNG.NextDouble(0.98f, 1.02f);
channel.Play(); channel.Play();
}
}); });
} }
} }