Use int for audio sliders, show current value (#235)

This commit is contained in:
Irastris
2026-04-05 14:31:45 -04:00
committed by GitHub
parent adf22e69c1
commit 13f24a585d
3 changed files with 18 additions and 17 deletions
+5 -5
View File
@@ -15,11 +15,11 @@ struct UserSettings {
struct {
// Audio
float masterVolume;
float mainMusicVolume;
float subMusicVolume;
float soundEffectsVolume;
float fanfareVolume;
int masterVolume;
int mainMusicVolume;
int subMusicVolume;
int soundEffectsVolume;
int fanfareVolume;
bool enableReverb;
} audio;
+8 -7
View File
@@ -34,28 +34,29 @@ namespace dusk {
if (ImGui::BeginMenu("Audio")) {
ImGui::Text("Master Volume");
ImGui::SliderFloat("##masterVolume", &getSettings().audio.masterVolume, 0.0f, 1.0f, "");
ImGui::SliderInt("##masterVolume", &getSettings().audio.masterVolume, 0, 100);
ImGui::Checkbox("Enable Reverb", &getSettings().audio.enableReverb);
/*
// TODO: implement additional settings
// TODO: Implement additional settings
ImGui::Text("Main Music Volume");
ImGui::SliderFloat("##mainMusicVolume", &getSettings().audio.mainMusicVolume, 0.0f, 1.0f, "");
ImGui::SliderFloat("##mainMusicVolume", &getSettings().audio.mainMusicVolume, 0, 100);
ImGui::Text("Sub Music Volume");
ImGui::SliderFloat("##subMusicVolume", &getSettings().audio.subMusicVolume, 0.0f, 1.0f, "");
ImGui::SliderFloat("##subMusicVolume", &getSettings().audio.subMusicVolume, 0, 100);
ImGui::Text("Sound Effects Volume");
ImGui::SliderFloat("##soundEffectsVolume", &getSettings().audio.soundEffectsVolume, 0.0f, 1.0f, "");
ImGui::SliderFloat("##soundEffectsVolume", &getSettings().audio.soundEffectsVolume, 0, 100);
ImGui::Text("Fanfare Volume");
ImGui::SliderFloat("##fanfareVolume", &getSettings().audio.fanfareVolume, 0.0f, 1.0f, "");
ImGui::SliderFloat("##fanfareVolume", &getSettings().audio.fanfareVolume, 0, 100);
Z2AudioMgr* audioMgr = Z2AudioMgr::getInterface();
if (audioMgr != nullptr) {
}
*/
audio::SetMasterVolume(getSettings().audio.masterVolume);
audio::SetMasterVolume(getSettings().audio.masterVolume / 100.0f);
audio::EnableReverb = getSettings().audio.enableReverb;
ImGui::EndMenu();
+5 -5
View File
@@ -12,11 +12,11 @@ UserSettings g_userSettings = {
// Audio
.audio = {
.masterVolume = 0.8f,
.mainMusicVolume = 1.0f,
.subMusicVolume = 1.0f,
.soundEffectsVolume = 1.0f,
.fanfareVolume = 1.0f,
.masterVolume = 80,
.mainMusicVolume = 100,
.subMusicVolume = 100,
.soundEffectsVolume = 100,
.fanfareVolume = 100,
.enableReverb = true
},