From c1a22d43a9518afcdf2e1636836346c59078e295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Balogh=20Kriszti=C3=A1n?= Date: Sun, 16 Aug 2026 00:47:51 +0200 Subject: [PATCH] changableaudiosreamplayer3d partial fix it does not do what it's supposed to for some reason when easy_audio is turned off it sounds like it plays the audio 212 times, or with wrong effect parameters. but atleast now it doesnt crash --- addons/spatial_audio_3d/spatial_audio_3d.gd | 37 +++++++++++---------- default_bus_layout.tres | 4 +-- entities/usable/music_player.gd | 2 +- entities/usable/music_player.tscn | 10 ++++++ scenes/changable_sound_emitter.gd | 15 +++++---- 5 files changed, 42 insertions(+), 26 deletions(-) diff --git a/addons/spatial_audio_3d/spatial_audio_3d.gd b/addons/spatial_audio_3d/spatial_audio_3d.gd index 6de440d..1cf33ac 100644 --- a/addons/spatial_audio_3d/spatial_audio_3d.gd +++ b/addons/spatial_audio_3d/spatial_audio_3d.gd @@ -48,7 +48,7 @@ class_name SpatialAudio3D extends AudioStreamPlayer3D @export var shut_up: bool = false ## Mute output. @export var debug: bool = false ## Visualize raycasts, measurement rays and reverb-audioplayers. -@onready var player_camera: Camera3D = get_viewport().get_camera_3d() # store reference to camera so that global_position is always up to date +@onready var player_camera: Camera3D = null # store reference to camera so that global_position is always up to date #@onready var raycasts_coords: Array = [ #Vector3(0, 0, max_raycast_distance), # N #Vector3(max_raycast_distance, 0, max_raycast_distance), # NW @@ -134,8 +134,8 @@ func _physics_process(_delta): _tick_counter += 1 -func do_play(): - soundsource.do_play() +func do_play(start:float = 0.0): + soundsource.do_play(start) func do_stop(): @@ -507,7 +507,7 @@ class Soundsource extends SpatialAudio3D: r.soundplayer_standby.stream = s - func do_play(): + func do_play(start:float = 0.0): if shut_up: return @@ -521,11 +521,11 @@ class Soundsource extends SpatialAudio3D: if reverb_enabled: for r in reverbers: - r.do_play() + r.do_play(start) # start play on both - soundplayer_active.do_play() - soundplayer_standby.do_play() + soundplayer_active.do_play(start) + soundplayer_standby.do_play(start) func _clear_play_lock(): @@ -542,6 +542,7 @@ class Soundsource extends SpatialAudio3D: func update_run(): + player_camera = get_viewport().get_camera_3d() if player_camera: distance_to_player = global_position.distance_to(player_camera.global_position) @@ -638,19 +639,18 @@ class Reverber extends SpatialAudio3D: var raycast_index: int var distance_to_soundsource: float var distance_to_player: float - var soundplayer_active: Soundplayer - var soundplayer_standby: Soundplayer + var soundplayer_active: Soundplayer = create_soundplayer(name + "-A") + var soundplayer_standby: Soundplayer = create_soundplayer(name + "-B") func _ready(): name = name + "#" + str(raycast_index) # create reverb-soundplayers for AB-reverb - soundplayer_active = create_soundplayer(name + "-A") - soundplayer_standby = create_soundplayer(name + "-B") + #soundplayer_active = create_soundplayer(name + "-A") + #soundplayer_standby = create_soundplayer(name + "-B") get_tree().get_root().add_child(soundplayer_active) get_tree().get_root().add_child(soundplayer_standby) - func _exit_tree(): soundplayer_active.queue_free() soundplayer_standby.queue_free() @@ -661,9 +661,9 @@ class Reverber extends SpatialAudio3D: pass - func do_play(): - soundplayer_active.do_play() - soundplayer_standby.do_play() + func do_play(start:float = 0.0): + soundplayer_active.do_play(start) + soundplayer_standby.do_play(start) func do_stop(): @@ -834,9 +834,9 @@ class Soundplayer extends SpatialAudio3D: remove_child(c) - func do_play(): + func do_play(start:float = 0.0): #if debug: printerr(str(Time.get_ticks_msec()) + ": start playing on " + name + ", stream: " + str(stream)) - play() + play(start) func do_stop(): @@ -912,6 +912,9 @@ class Soundplayer extends SpatialAudio3D: func update_effect_params(): # update distance vars + if soundsource == null: + return + distance_to_soundsource = global_position.distance_to(soundsource.global_position) if player_camera: distance_to_player = global_position.distance_to(player_camera.global_position) diff --git a/default_bus_layout.tres b/default_bus_layout.tres index f0ed2cf..44b15e9 100644 --- a/default_bus_layout.tres +++ b/default_bus_layout.tres @@ -47,6 +47,6 @@ bus/2/bypass_fx = false bus/2/volume_db = 0.0 bus/2/send = &"Master" bus/2/effect/0/effect = SubResource("AudioEffectDelay_j3pel") -bus/2/effect/0/enabled = true +bus/2/effect/0/enabled = false bus/2/effect/1/effect = SubResource("AudioEffectReverb_j3pel") -bus/2/effect/1/enabled = true +bus/2/effect/1/enabled = false diff --git a/entities/usable/music_player.gd b/entities/usable/music_player.gd index b70da27..98554b1 100644 --- a/entities/usable/music_player.gd +++ b/entities/usable/music_player.gd @@ -6,7 +6,7 @@ var is_playing: bool = false func toggle(): is_playing = !is_playing - audio_player.do_play(3.5) + %SpatialAudio3D.do_play(3.5) # Called when the node enters the scene tree for the first time. func _ready() -> void: diff --git a/entities/usable/music_player.tscn b/entities/usable/music_player.tscn index e74d74b..c398abd 100644 --- a/entities/usable/music_player.tscn +++ b/entities/usable/music_player.tscn @@ -4,6 +4,7 @@ [ext_resource type="PackedScene" uid="uid://cbpl3s326ok8d" path="res://entities/usable/button/button.tscn" id="1_t1vpp"] [ext_resource type="Script" uid="uid://v7j6ovrub5cp" path="res://scenes/changable_sound_emitter.gd" id="3_johh1"] [ext_resource type="AudioStream" uid="uid://b14wn4nntykxv" path="res://assets/sounds/music/Bach_ Toccata and Fugue in D Minor, BWV 565.mp3" id="3_rf3au"] +[ext_resource type="Script" uid="uid://y8x4svl5kej2" path="res://addons/spatial_audio_3d/spatial_audio_3d.gd" id="5_pd776"] [sub_resource type="CylinderMesh" id="CylinderMesh_b5l5s"] top_radius = 0.025390625 @@ -37,4 +38,13 @@ mesh = SubResource("TubeTrailMesh_b5l5s") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.9425293, 0.23302945) stream = ExtResource("3_rf3au") script = ExtResource("3_johh1") +easy_audio = false metadata/_custom_type_script = "uid://v7j6ovrub5cp" + +[node name="SpatialAudio3D" type="AudioStreamPlayer3D" parent="." unique_id=384959870] +unique_name_in_owner = true +stream = ExtResource("3_rf3au") +script = ExtResource("5_pd776") +collision_mask = 17 +debug = true +metadata/_custom_type_script = "uid://y8x4svl5kej2" diff --git a/scenes/changable_sound_emitter.gd b/scenes/changable_sound_emitter.gd index 9747e7d..9e8dd96 100644 --- a/scenes/changable_sound_emitter.gd +++ b/scenes/changable_sound_emitter.gd @@ -65,8 +65,6 @@ func set_to_raytraced_audio() -> void: audio_player.queue_free() audio_player = SpatialAudio3D.new() - audio_player.do_set_stream(stream) - audio_player.global_position = global_position audio_player.reverb_enabled = reverb_enabled audio_player.reverb_volume_db = reverb_volume_db @@ -82,12 +80,13 @@ func set_to_raytraced_audio() -> void: audio_player.speed_of_sound = speed_of_sound audio_player.prox_reduction = prox_reduction audio_player.reverb_raycast_count = reverb_raycast_count + + audio_player.name = "music player" audio_player.audiophysics_ticks = 10 - audio_player.loop = false - audio_player.shut_up = false - audio_player.debug = false - + audio_player.loop = loop + audio_player.shut_up = shut_up + audio_player.debug = debug add_child(audio_player) @@ -97,3 +96,7 @@ func _ready() -> void: set_to_easy_audio() else: set_to_raytraced_audio() + audio_player.stream = stream + audio_player.do_set_stream(stream) + + audio_player.global_position = global_position