jaildesigner-jailgames/orni-attack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

feat(config): persistència de les opcions d'àudio al config.yaml

Browse Source
This commit is contained in:
Sergio Valor
2026-05-24 18:40:33 +02:00
parent bacfbe6eac
commit 8c48a9a772
4 changed files with 68 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/config_yaml.cpp
+40
View File
@@ -5,6 +5,7 @@
#include <string>
#include <unordered_map>
#include "core/defaults/audio.hpp"
#include "core/defaults/rendering.hpp"
#include "core/defaults/window.hpp"
#include "external/fkyaml_node.hpp"
@@ -17,6 +18,7 @@ namespace ConfigYaml {
// Permeten escriure window.width en lloc d'engine_config.window.width.
Config::WindowConfig& window = engine_config.window;
Config::RenderingConfig& rendering = engine_config.rendering;
Config::AudioConfig& audio = engine_config.audio;
Config::PlayerBindings& player1 = engine_config.player1;
Config::PlayerBindings& player2 = engine_config.player2;
bool& console = engine_config.console;
@@ -209,6 +211,14 @@ namespace ConfigYaml {
rendering.render_width = Defaults::Rendering::RENDER_WIDTH_DEFAULT;
rendering.render_height = Defaults::Rendering::RENDER_HEIGHT_DEFAULT;
// Audio
audio.enabled = Defaults::Audio::ENABLED;
audio.volume = Defaults::Audio::VOLUME;
audio.music_enabled = Defaults::Audio::MUSIC_ENABLED;
audio.music_volume = Defaults::Audio::MUSIC_VOLUME;
audio.sound_enabled = Defaults::Audio::SOUND_ENABLED;
audio.sound_volume = Defaults::Audio::SOUND_VOLUME;
// Idioma
locale = "ca";
@@ -307,6 +317,22 @@ namespace ConfigYaml {
}
}
static void loadAudioConfigFromYaml(const fkyaml::node& yaml) {
if (!yaml.contains("audio")) {
return;
}
const auto& aud = yaml["audio"];
auto in_unit_range = [](float v) { return v >= 0.0F && v <= 1.0F; };
readField(aud, "enabled", audio.enabled, Defaults::Audio::ENABLED);
readField(aud, "volume", audio.volume, Defaults::Audio::VOLUME, in_unit_range);
readField(aud, "music_enabled", audio.music_enabled, Defaults::Audio::MUSIC_ENABLED);
readField(aud, "music_volume", audio.music_volume, Defaults::Audio::MUSIC_VOLUME, in_unit_range);
readField(aud, "sound_enabled", audio.sound_enabled, Defaults::Audio::SOUND_ENABLED);
readField(aud, "sound_volume", audio.sound_volume, Defaults::Audio::SOUND_VOLUME, in_unit_range);
}
// Carregar controls del player 1 desde YAML
static void loadPlayer1ControlsFromYaml(const fkyaml::node& yaml) {
if (!yaml.contains("player1")) {
@@ -447,6 +473,7 @@ namespace ConfigYaml {
// Carregar seccions
loadWindowConfigFromYaml(yaml);
loadRenderingConfigFromYaml(yaml);
loadAudioConfigFromYaml(yaml);
loadPlayer1ControlsFromYaml(yaml);
loadPlayer2ControlsFromYaml(yaml);
@@ -479,6 +506,17 @@ namespace ConfigYaml {
}
}
static void saveAudioConfigToYaml(std::ofstream& file) {
file << "# AUDIO\n";
file << "audio:\n";
file << " enabled: " << (audio.enabled ? "true" : "false") << " # ON/OFF general\n";
file << " volume: " << audio.volume << " # Master 0.0-1.0\n";
file << " music_enabled: " << (audio.music_enabled ? "true" : "false") << "\n";
file << " music_volume: " << audio.music_volume << " # 0.0-1.0\n";
file << " sound_enabled: " << (audio.sound_enabled ? "true" : "false") << "\n";
file << " sound_volume: " << audio.sound_volume << " # 0.0-1.0\n\n";
}
// Guardar controls del player 1 a YAML
static void savePlayer1ControlsToYaml(std::ofstream& file) {
file << "# CONTROLS JUGADOR 1\n";
@@ -549,6 +587,8 @@ namespace ConfigYaml {
file << "# IDIOMA\n";
file << "locale: " << locale << " # ca | en\n\n";
saveAudioConfigToYaml(file);
// Guardar controls de jugadors
savePlayer1ControlsToYaml(file);
savePlayer2ControlsToYaml(file);