From 4c502cdbc9f3a6780272e45af337e2a1cb0042e1 Mon Sep 17 00:00:00 2001 From: Ken Cooke Date: Thu, 3 Jan 2019 15:17:41 -0800 Subject: [PATCH] Revert to simpler approximation for stream sorting --- assignment-client/src/audio/AudioMixerSlave.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/assignment-client/src/audio/AudioMixerSlave.cpp b/assignment-client/src/audio/AudioMixerSlave.cpp index 573dab030e..b699970560 100644 --- a/assignment-client/src/audio/AudioMixerSlave.cpp +++ b/assignment-client/src/audio/AudioMixerSlave.cpp @@ -727,13 +727,9 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi // distance attenuation: approximate, ignore zone-specific attenuations glm::vec3 relativePosition = streamToAdd.getPosition() - listeningNodeStream.getPosition(); float distance = glm::length(relativePosition); - - float d = (1.0f / ATTN_DISTANCE_REF) * std::max(distance, HRTF_NEARFIELD_MIN); - gain = gain / d; - gain = std::min(gain, ATTN_GAIN_MAX); + return gain / distance; // avatar: skip master gain - it is constant for all streams - return gain; } float computeGain(float masterListenerGain, const AvatarAudioStream& listeningNodeStream,