From e0bbf4aa3599f9b3b098c99f5108b7da1bc2d321 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 14 Apr 2025 09:13:22 +0200 Subject: [PATCH] =?UTF-8?q?rajouter=20des=20bus=20pour=20les=20diff=C3=A9r?= =?UTF-8?q?ents=20audios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- caracters/bob/bob.tscn | 1 - caracters/musicians/Thomas.tscn | 2 +- caracters/musicians/thomas.gd | 8 +++----- caracters/player/player.tscn | 2 +- caracters/player/player_controler.gd | 1 + default_bus_layout.tres | 29 ++++++++++++++++++++++++++++ game_state.gd | 2 +- vehicules/car.gd | 2 +- vehicules/car.tscn | 2 +- 9 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 default_bus_layout.tres diff --git a/caracters/bob/bob.tscn b/caracters/bob/bob.tscn index cbd89ff..8bebfef 100644 --- a/caracters/bob/bob.tscn +++ b/caracters/bob/bob.tscn @@ -103,7 +103,6 @@ position = Vector2(44, -38) [node name="FeetSound" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("13_7opcx") autoplay = true -stream_paused = true [connection signal="start_intracting" from="." to="npcControler" method="_on_character_body_2d_start_intracting"] [connection signal="area_entered" from="detector" to="." method="_on_area_2d_area_entered"] diff --git a/caracters/musicians/Thomas.tscn b/caracters/musicians/Thomas.tscn index 8ef6976..207092a 100644 --- a/caracters/musicians/Thomas.tscn +++ b/caracters/musicians/Thomas.tscn @@ -67,7 +67,7 @@ shape = SubResource("CapsuleShape2D_0816g") stream = ExtResource("3_redb5") volume_db = 1.0 autoplay = true -stream_paused = true +bus = &"Music" playback_type = 1 parameters/looping = false diff --git a/caracters/musicians/thomas.gd b/caracters/musicians/thomas.gd index b625a88..d7741be 100644 --- a/caracters/musicians/thomas.gd +++ b/caracters/musicians/thomas.gd @@ -14,11 +14,6 @@ func _ready() -> void: func _process(delta: float) -> void: if $AudioStreamPlayer2D.get_playback_position() != 0: GameState.float_thomas_music_position = $AudioStreamPlayer2D.get_playback_position() - var stream : AudioStream = $AudioStreamPlayer2D.stream - if stream: - var l = stream.get_length() - if is_zero_approx(l - GameState.float_thomas_music_position): - play_next_song() func _on_load_from_game_state() -> void: if GameState.float_thomas_music_position > 1: @@ -38,3 +33,6 @@ func play_next_song(): func _on_outside_unload_from_screen() -> void: $AudioStreamPlayer2D.stream_paused = true + +func _on_audio_stream_player_2d_finished() -> void: + play_next_song() diff --git a/caracters/player/player.tscn b/caracters/player/player.tscn index ab609b4..1b4ba3b 100644 --- a/caracters/player/player.tscn +++ b/caracters/player/player.tscn @@ -99,7 +99,7 @@ can_walk_on_roads = true [node name="FeetSound" type="AudioStreamPlayer" parent="."] stream = ExtResource("8_73an3") autoplay = true -stream_paused = true +bus = &"player_foot_step" playback_type = 1 [connection signal="loadFromGameState" from="." to="controleur" method="_on_character_body_2d_load_from_game_state"] diff --git a/caracters/player/player_controler.gd b/caracters/player/player_controler.gd index 1306057..c01a092 100644 --- a/caracters/player/player_controler.gd +++ b/caracters/player/player_controler.gd @@ -10,6 +10,7 @@ extends Node2D var can_interact_with : Node2D func _unhandled_input(event: InputEvent) -> void: + print(human.get_feet_global_position()) human.stop_interaction() human.velocityVector = Vector2(0, 0) human.wants_to_grab = false diff --git a/default_bus_layout.tres b/default_bus_layout.tres new file mode 100644 index 0000000..21cb17d --- /dev/null +++ b/default_bus_layout.tres @@ -0,0 +1,29 @@ +[gd_resource type="AudioBusLayout" load_steps=2 format=3 uid="uid://dd5noy53kwyyw"] + +[sub_resource type="AudioEffectReverb" id="AudioEffectReverb_wdi0e"] +resource_name = "Reverb" +room_size = 0.06 +damping = 0.07 +spread = 0.35 + +[resource] +bus/1/name = &"Music" +bus/1/solo = false +bus/1/mute = false +bus/1/bypass_fx = false +bus/1/volume_db = 0.0 +bus/1/send = &"Master" +bus/2/name = &"Fx" +bus/2/solo = false +bus/2/mute = false +bus/2/bypass_fx = false +bus/2/volume_db = 0.0 +bus/2/send = &"Master" +bus/3/name = &"player_foot_step" +bus/3/solo = false +bus/3/mute = false +bus/3/bypass_fx = false +bus/3/volume_db = 0.0 +bus/3/send = &"Fx" +bus/3/effect/0/effect = SubResource("AudioEffectReverb_wdi0e") +bus/3/effect/0/enabled = false diff --git a/game_state.gd b/game_state.gd index e2ac5ac..c3893b2 100644 --- a/game_state.gd +++ b/game_state.gd @@ -13,7 +13,7 @@ var isPlayerDeaf = false var float_thomas_music_position = 0 var current_scene = "outside" -var position_outside = Vector2(-171, -253) +var position_outside = Vector2(-134.3333, -164.0905) var position_bakery = Vector2(461, 710) func update_position(p: Vector2): diff --git a/vehicules/car.gd b/vehicules/car.gd index 97cbd9c..a158aa0 100644 --- a/vehicules/car.gd +++ b/vehicules/car.gd @@ -29,7 +29,7 @@ func _ready() -> void: # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: - var pitch = current_speed / speed + var pitch = (current_speed / speed) * 1.35 if is_zero_approx(pitch): pitch = 0.01 $AudioStreamPlayer2D.pitch_scale = pitch diff --git a/vehicules/car.tscn b/vehicules/car.tscn index c228280..43d10b5 100644 --- a/vehicules/car.tscn +++ b/vehicules/car.tscn @@ -604,7 +604,7 @@ target_position = Vector2(1, -32) [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] stream = ExtResource("4_o8ske") -volume_db = -15.359 +volume_db = -4.687 autoplay = true attenuation = 2.0 playback_type = 1