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

Merge pull request #19850 from nekodex/text-selection-sfx

Browse Source 
Add audio feedback for text selection
This commit is contained in:
Dean Herbert 2022-08-27 00:54:28 +09:00 committed by GitHub
commit 35f0273c8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 91 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
osu.Game/Graphics/UserInterface/OsuTextBox.cs
View File

@ -46,8 +46,24 @@ namespace osu.Game.Graphics.UserInterface
private Sample? textCommittedSample; private Sample? textCommittedSample;
private Sample? caretMovedSample; private Sample? caretMovedSample;
private Sample? selectCharSample;
private Sample? selectWordSample;
private Sample? selectAllSample;
private Sample? deselectSample;
private OsuCaret? caret; private OsuCaret? caret;
private bool selectionStarted;
private double sampleLastPlaybackTime;
private enum SelectionSampleType
{
Character,
Word,
All,
Deselect
}
public OsuTextBox() public OsuTextBox()
{ {
Height = 40; Height = 40;
@ -78,6 +94,11 @@ namespace osu.Game.Graphics.UserInterface
textRemovedSample = audio.Samples.Get(@"Keyboard/key-delete"); textRemovedSample = audio.Samples.Get(@"Keyboard/key-delete");
textCommittedSample = audio.Samples.Get(@"Keyboard/key-confirm"); textCommittedSample = audio.Samples.Get(@"Keyboard/key-confirm");
caretMovedSample = audio.Samples.Get(@"Keyboard/key-movement"); caretMovedSample = audio.Samples.Get(@"Keyboard/key-movement");
selectCharSample = audio.Samples.Get(@"Keyboard/select-char");
selectWordSample = audio.Samples.Get(@"Keyboard/select-word");
selectAllSample = audio.Samples.Get(@"Keyboard/select-all");
deselectSample = audio.Samples.Get(@"Keyboard/deselect");
} }
private Color4 selectionColour; private Color4 selectionColour;
@ -112,7 +133,41 @@ namespace osu.Game.Graphics.UserInterface
{ {
base.OnCaretMoved(selecting); base.OnCaretMoved(selecting);
caretMovedSample?.Play(); if (!selecting)
caretMovedSample?.Play();
}
protected override void OnTextSelectionChanged(TextSelectionType selectionType)
{
base.OnTextSelectionChanged(selectionType);
switch (selectionType)
{
case TextSelectionType.Character:
playSelectSample(SelectionSampleType.Character);
break;
case TextSelectionType.Word:
playSelectSample(selectionStarted ? SelectionSampleType.Character : SelectionSampleType.Word);
break;
case TextSelectionType.All:
playSelectSample(SelectionSampleType.All);
break;
}
selectionStarted = true;
}
protected override void OnTextDeselected()
{
base.OnTextDeselected();
if (!selectionStarted) return;
playSelectSample(SelectionSampleType.Deselect);
selectionStarted = false;
} }
protected override void OnImeComposition(string newComposition, int removedTextLength, int addedTextLength, bool caretMoved) protected override void OnImeComposition(string newComposition, int removedTextLength, int addedTextLength, bool caretMoved)
@ -204,6 +259,41 @@ namespace osu.Game.Graphics.UserInterface
SelectionColour = SelectionColour, SelectionColour = SelectionColour,
}; };
private void playSelectSample(SelectionSampleType selectionType)
{
if (Time.Current < sampleLastPlaybackTime + 15) return;
SampleChannel? channel;
double pitch = 0.98 + RNG.NextDouble(0.04);
switch (selectionType)
{
case SelectionSampleType.All:
channel = selectAllSample?.GetChannel();
break;
case SelectionSampleType.Word:
channel = selectWordSample?.GetChannel();
break;
case SelectionSampleType.Deselect:
channel = deselectSample?.GetChannel();
break;
default:
channel = selectCharSample?.GetChannel();
pitch += (SelectedText.Length / (double)Text.Length) * 0.15f;
break;
}
if (channel == null) return;
channel.Frequency.Value = pitch;
channel.Play();
sampleLastPlaybackTime = Time.Current;
}
private void playTextAddedSample() => textAddedSamples[RNG.Next(0, textAddedSamples.Length)]?.Play(); private void playTextAddedSample() => textAddedSamples[RNG.Next(0, textAddedSamples.Length)]?.Play();
private class OsuCaret : Caret private class OsuCaret : Caret