Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix AudioStreamPlayer3D autoplay and internal notifications #87732

Merged
merged 1 commit into from
Jan 30, 2024
Merged

Fix AudioStreamPlayer3D autoplay and internal notifications #87732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scene/3d/audio_stream_player_3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ float AudioStreamPlayer3D::_get_attenuation_db(float p_distance) const {
}

void AudioStreamPlayer3D::_notification(int p_what) {
internal->notification(p_what);
switch (p_what) {
Comment on lines +243 to 244
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
internal->notification(p_what);
switch (p_what) {
internal->notification(p_what);
switch (p_what) {

If we wanted to be more consistent with AudioStreamPlayer2D.

Copy link
Member Author

@aaronfranke aaronfranke Jan 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tend to avoid empty lines that bring no value to the reader, also it's more consistent with this code:

void AudioStreamPlayer3D::_calc_output_vol(const Vector3 &source_dir, real_t tightness, Vector<AudioFrame> &output) {
	unsigned int speaker_count = 0; // only main speakers (no LFE)
	switch (AudioServer::get_singleton()->get_speaker_mode()) {

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then you could update AudioStreamPlayer2D code, so they are "in sync".

case NOTIFICATION_ENTER_TREE: {
velocity_tracker->reset(get_global_transform().origin);
Expand Down
Loading