From 52d8bdf306201f911b4c4665c9f1b2fa4ab4c7a2 Mon Sep 17 00:00:00 2001 From: yannk Date: Fri, 22 Apr 2022 09:58:30 +0200 Subject: [PATCH] Implementing first use of configuration file with music volume --- scenes/music/music_manager.gd | 6 ++++-- scenes/music/music_manager.tscn | 1 + scripts/user_settings.gd | 5 +---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scenes/music/music_manager.gd b/scenes/music/music_manager.gd index a519ac0..e7b3f43 100644 --- a/scenes/music/music_manager.gd +++ b/scenes/music/music_manager.gd @@ -42,8 +42,10 @@ func _ready(): # var t = linear2db(0.0) # var u = db2linear($Music.get_volume_db()) # Common.msg_debug("volume :" + str(u)) - $Window/VBox/Tab/Mixer/MusicLevel/music.set_value( int(db2linear($Music.get_volume_db()) * float(user_settings.configuration["sound"]["music_volume"]))) - $Window/VBox/Tab/Mixer/MusicLevel/Value.set_text(str(int(db2linear($Music.get_volume_db()) * float(user_settings.configuration["sound"]["music_volume"])))) + var music_volume = float(user_settings.configuration["sound"]["music_volume"]) + $Music.set_volume_db(linear2db(music_volume/100.0)) + $Window/VBox/Tab/Mixer/MusicLevel/music.set_value( int(db2linear($Music.get_volume_db()) * 100)) + $Window/VBox/Tab/Mixer/MusicLevel/Value.set_text(str(int(db2linear($Music.get_volume_db()) * 100))) var bus_name = $Music.get_bus() Common.msg_debug("bus_name: " + str(bus_name)) var bus_id = AudioServer.get_bus_index(bus_name) diff --git a/scenes/music/music_manager.tscn b/scenes/music/music_manager.tscn index eeadc05..4c75b49 100644 --- a/scenes/music/music_manager.tscn +++ b/scenes/music/music_manager.tscn @@ -6,6 +6,7 @@ script = ExtResource( "1_dltpv" ) [node name="Music" type="AudioStreamPlayer" parent="."] +volume_db = 23.803 [node name="EndMusic" type="Timer" parent="."] diff --git a/scripts/user_settings.gd b/scripts/user_settings.gd index 267c5be..e40bd3f 100644 --- a/scripts/user_settings.gd +++ b/scripts/user_settings.gd @@ -3,11 +3,8 @@ extends Node var cfg_path = "user://settings.cfg" @onready var configuration = get_settings() -# Called when the node enters the scene tree for the first time. -func _ready(): - pass - func save(): + Common.msg_debug("Save to config file : %s/%s" % [OS.get_user_data_dir(), cfg_path.replace("user://", "")]) var file = ConfigFile.new() for section in configuration.keys(): for key in configuration[section].keys():