diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 09:28:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 09:28:50 +0100 |
| commit | 4507d0cd2b034d1396ba9a6dc8bdb3fd76b0b36d (patch) | |
| tree | 72bec26b821a15563783af6cab7479f9b8f22db6 | |
| parent | 24fa0d871d51a7927027b7a1cc013d8681a53929 (diff) | |
| parent | ff1fbd2bc593a83a9b5c94e734a550377021efa0 (diff) | |
Merge pull request #37279 from Waridley/fix_22016
Fix volume interpolation in positional audio nodes
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 2 | ||||
| -rw-r--r-- | scene/3d/audio_stream_player_3d.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index aa4ed233fb..3ef4dfe5f1 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -87,7 +87,7 @@ void AudioStreamPlayer2D::_mix_audio() { AudioFrame target_volume = stream_paused_fade_out ? AudioFrame(0.f, 0.f) : current.vol; AudioFrame vol_prev = stream_paused_fade_in ? AudioFrame(0.f, 0.f) : prev_outputs[i].vol; AudioFrame vol_inc = (target_volume - vol_prev) / float(buffer_size); - AudioFrame vol = stream_paused_fade_in ? AudioFrame(0.f, 0.f) : current.vol; + AudioFrame vol = vol_prev; int cc = AudioServer::get_singleton()->get_channel_count(); diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 855d254bd6..f0a61a905c 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -213,7 +213,7 @@ void AudioStreamPlayer3D::_mix_audio() { AudioFrame target_volume = stream_paused_fade_out ? AudioFrame(0.f, 0.f) : current.vol[k]; AudioFrame vol_prev = stream_paused_fade_in ? AudioFrame(0.f, 0.f) : prev_outputs[i].vol[k]; AudioFrame vol_inc = (target_volume - vol_prev) / float(buffer_size); - AudioFrame vol = stream_paused_fade_in ? AudioFrame(0.f, 0.f) : current.vol[k]; + AudioFrame vol = vol_prev; if (!AudioServer::get_singleton()->thread_has_channel_mix_buffer(current.bus_index, k)) continue; //may have been deleted, will be updated on process |