AxioDL/amuse
2
0
Fork 0
mirror of https://github.com/AxioDL/amuse.git synced 2025-12-08 21:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Voice lifetime and emitter bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2017-11-27 16:44:35 -10:00
parent ebe6f18898
commit 3c7cf5515f
3 changed files with 83 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/Emitter.cpp
View File

@@ -17,7 +17,7 @@ Emitter::~Emitter() {}
Emitter::Emitter(Engine& engine, const AudioGroup& group, const std::shared_ptr<Voice>& vox,
float maxDist, float minVol, float falloff, bool doppler)
: Entity(engine, group, vox->getObjectId()), m_vox(vox), m_maxDist(maxDist),
: Entity(engine, group, vox->getGroupId(), vox->getObjectId()), m_vox(vox), m_maxDist(maxDist),
m_minVol(clamp(0.f, minVol, 1.f)), m_falloff(clamp(-1.f, falloff, 1.f)), m_doppler(doppler)
{
}
@@ -86,15 +86,18 @@ void Emitter::_update()
/* Calculate attenuation */
float att = _attenuationCurve(dist);
att = (1.f - att) * m_minVol + att * m_maxVol;
if (att > FLT_EPSILON)
{
att = (1.f - att) * m_minVol + att * m_maxVol;
/* Apply pan law */
float thisCoefs[8] = {};
m_vox->_panLaw(thisCoefs, frontPan, backPan, span);
/* Apply pan law */
float thisCoefs[8] = {};
m_vox->_panLaw(thisCoefs, frontPan, backPan, span);
/* Take maximum coefficient across listeners */
for (int i=0 ; i<8 ; ++i)
coefs[i] = std::max(coefs[i], thisCoefs[i] * att * listener->m_volume);
/* Take maximum coefficient across listeners */
for (int i = 0; i < 8; ++i)
coefs[i] = std::max(coefs[i], thisCoefs[i] * att * listener->m_volume);
}
/* Calculate doppler */
if (m_doppler)