RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-02-09 14:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debounce hover sounds

Browse Source
This commit is contained in:
phosphene47 2019-11-27 22:47:00 +11:00
parent 005a492838
commit b126700f01
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Graphics/UserInterface/HoverClickSounds.cs
View File

@ -1,12 +1,14 @@
// 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.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions;
using osu.Framework.Input.Events;
using osu.Framework.Threading;
using osuTK.Input;
namespace osu.Game.Graphics.UserInterface
@ -34,10 +36,21 @@ namespace osu.Game.Graphics.UserInterface
this.buttons = buttons ?? new[] { MouseButton.Left };
}
private ScheduledDelegate playDelegate;
protected override bool OnClick(ClickEvent e)
{
playDelegate?.Cancel();
if (buttons.Contains(e.Button) && Contains(e.ScreenSpaceMousePosition))
sampleClick?.Play();
{
var debounceMs = (int)DebounceTime.TotalMilliseconds;
if (debounceMs == 0)
sampleClick?.Play();
else
playDelegate = Scheduler.AddDelayed(() => sampleClick?.Play(), debounceMs);
}
return base.OnClick(e);
}

20
osu.Game/Graphics/UserInterface/HoverSounds.cs
View File

@ -1,6 +1,7 @@
// 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.ComponentModel;
using osu.Framework.Allocation;
using osu.Framework.Audio;
@ -9,6 +10,7 @@ using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
using osu.Framework.Threading;
namespace osu.Game.Graphics.UserInterface
{
@ -20,6 +22,12 @@ namespace osu.Game.Graphics.UserInterface
{
private SampleChannel sampleHover;
/// <summary>
/// Length of debounce for sound playback.
/// Set this to <see cref="TimeSpan.Zero"/> to disable debouncing.
/// </summary>
public TimeSpan DebounceTime { get; set; } = TimeSpan.FromMilliseconds(50);
protected readonly HoverSampleSet SampleSet;
public HoverSounds(HoverSampleSet sampleSet = HoverSampleSet.Normal)
@ -28,9 +36,19 @@ namespace osu.Game.Graphics.UserInterface
RelativeSizeAxes = Axes.Both;
}
private ScheduledDelegate playDelegate;
protected override bool OnHover(HoverEvent e)
{
sampleHover?.Play();
playDelegate?.Cancel();
var debounceMs = (int)DebounceTime.TotalMilliseconds;
if (debounceMs == 0)
sampleHover?.Play();
else
playDelegate = Scheduler.AddDelayed(() => sampleHover?.Play(), debounceMs);
return base.OnHover(e);
}