Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:01:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert to simpler approximation for stream sorting

Browse source
This commit is contained in:
Ken Cooke 2019-01-03 15:17:41 -08:00
parent 83e1efd2f0
commit 4c502cdbc9
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assignment-client/src/audio/AudioMixerSlave.cpp
View file

@ -727,13 +727,9 @@ float approximateGain(const AvatarAudioStream& listeningNodeStream, const Positi
// distance attenuation: approximate, ignore zone-specific attenuations // distance attenuation: approximate, ignore zone-specific attenuations
glm::vec3 relativePosition = streamToAdd.getPosition() - listeningNodeStream.getPosition(); glm::vec3 relativePosition = streamToAdd.getPosition() - listeningNodeStream.getPosition();
float distance = glm::length(relativePosition); float distance = glm::length(relativePosition);
return gain / distance;
float d = (1.0f / ATTN_DISTANCE_REF) * std::max(distance, HRTF_NEARFIELD_MIN);
gain = gain / d;
gain = std::min(gain, ATTN_GAIN_MAX);
// avatar: skip master gain - it is constant for all streams // avatar: skip master gain - it is constant for all streams
return gain;
} }
float computeGain(float masterListenerGain, const AvatarAudioStream& listeningNodeStream, float computeGain(float masterListenerGain, const AvatarAudioStream& listeningNodeStream,