evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve button audio feedback

Browse Source
This commit is contained in:
Kae 2023-06-27 22:17:57 +10:00
parent 359624119a
commit 2496789ea7
7 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
assets/opensb/interface.config.patch
View File

@ -15,5 +15,11 @@
},
"debugFont" : "",
"planetNameFormatString" : "- {} -"
// Change planet name to support the new internal string formatting.
"planetNameFormatString" : "- {} -",
"buttonClickSound" : [ "/sfx/interface/button/click.wav" ],
"buttonReleaseSound" : [ "/sfx/interface/button/release.wav" ],
"buttonHoverSound" : [ "/sfx/interface/button/hover.wav" ],
"buttonHoverOffSound" : [ "/sfx/interface/button/hover_off.wav" ]
}

BIN
assets/opensb/sfx/interface/button/click.wav Normal file
View File

Binary file not shown.

BIN
assets/opensb/sfx/interface/button/hover.wav Normal file
View File

Binary file not shown.

BIN
assets/opensb/sfx/interface/button/hover_off.wav Normal file
View File

Binary file not shown.

BIN
assets/opensb/sfx/interface/button/release.wav Normal file
View File

Binary file not shown.

21
source/windowing/StarButtonWidget.cpp
View File

@ -27,6 +27,11 @@ ButtonWidget::ButtonWidget() {
m_fontSize = interfaceConfig.query("font.buttonSize").toInt();
m_fontDirectives = interfaceConfig.queryString("font.defaultDirectives", "");
m_font = interfaceConfig.query("font.defaultFont").toString();
m_clickSounds = jsonToStringList(assets->json("/interface.config:buttonClickSound"));
m_releaseSounds = jsonToStringList(assets->json("/interface.config:buttonReleaseSound"));
m_hoverSounds = jsonToStringList(assets->json("/interface.config:buttonHoverSound"));
m_hoverOffSounds = jsonToStringList(assets->json("/interface.config:buttonHoverOffSound"));
}
ButtonWidget::ButtonWidget(WidgetCallbackFunc callback,
@ -112,7 +117,7 @@ bool ButtonWidget::sendEvent(InputEvent const& event) {
if (inMember(*context()->mousePosition(event))) {
if (!isPressed()) {
auto assets = Root::singleton().assets();
auto sound = Random::randValueFrom(assets->json("/interface.config:buttonClickSound").toArray(), "").toString();
auto sound = Random::randValueFrom(m_clickSounds, "");
if (!sound.empty())
context()->playAudio(sound);
}
@ -126,6 +131,12 @@ bool ButtonWidget::sendEvent(InputEvent const& event) {
return false;
}
} else if (event.is<MouseButtonUpEvent>()) {
if (isPressed()) {
auto assets = Root::singleton().assets();
auto sound = Random::randValueFrom(m_releaseSounds, "");
if (!sound.empty())
context()->playAudio(sound);
}
setPressed(false);
return false;
}
@ -139,7 +150,7 @@ void ButtonWidget::mouseOver() {
if (!m_disabled) {
if (!m_hovered) {
auto assets = Root::singleton().assets();
auto sound = Random::randValueFrom(assets->json("/interface.config:buttonHoverSound").toArray(), "").toString();
auto sound = Random::randValueFrom(m_hoverSounds);
if (!sound.empty())
context()->playAudio(sound);
}
@ -149,6 +160,12 @@ void ButtonWidget::mouseOver() {
void ButtonWidget::mouseOut() {
Widget::mouseOut();
if (!m_disabled && m_hovered) {
auto assets = Root::singleton().assets();
auto sound = Random::randValueFrom(m_hoverOffSounds);
if (!sound.empty())
context()->playAudio(sound);
}
m_hovered = false;
m_pressed = false;
}

5
source/windowing/StarButtonWidget.hpp
View File

@ -127,6 +127,11 @@ protected:
String m_text;
Vec2I m_textOffset;
StringList m_clickSounds;
StringList m_releaseSounds;
StringList m_hoverSounds;
StringList m_hoverOffSounds;
bool m_sustain;
private: