diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-27 15:38:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-27 15:38:20 -0300 |
| commit | 54caaa21ce427ac3b240d5b514dc339fd8e13204 (patch) | |
| tree | fc2bfcdf0c1cc8fc8fd66e9bf68c1b74b006b4f9 /scene/main/viewport.cpp | |
| parent | 87f575efddf503297e056f169cfd8a68dbe859c5 (diff) | |
| parent | 3598d300cb43797a4f18b34d921875d060ce7de7 (diff) | |
Merge pull request #51296 from ellenhp/mix_in_audio_server
Move mixing out of the AudioStreamPlayback* nodes
Diffstat (limited to 'scene/main/viewport.cpp')
| -rw-r--r-- | scene/main/viewport.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 801c7cf86e..6e0b161e54 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -52,6 +52,7 @@ #include "scene/resources/text_line.h" #include "scene/resources/world_2d.h" #include "scene/scene_string_names.h" +#include "servers/audio_server.h" void ViewportTexture::setup_local_to_scene() { if (vp) { @@ -820,12 +821,7 @@ Rect2 Viewport::get_visible_rect() const { } void Viewport::_update_listener_2d() { - /* - if (is_inside_tree() && audio_listener_3d && (!get_parent() || (Object::cast_to<Control>(get_parent()) && Object::cast_to<Control>(get_parent())->is_visible_in_tree()))) - SpatialSound2DServer::get_singleton()->listener_set_space(internal_listener_2d, find_world_2d()->get_sound_space()); - else - SpatialSound2DServer::get_singleton()->listener_set_space(internal_listener_2d, RID()); -*/ + AudioServer::get_singleton()->notify_listener_changed(); } void Viewport::set_as_audio_listener_2d(bool p_enable) { @@ -3072,6 +3068,7 @@ bool Viewport::is_audio_listener_3d() const { } void Viewport::_update_listener_3d() { + AudioServer::get_singleton()->notify_listener_changed(); } void Viewport::_listener_transform_3d_changed_notify() { |