AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Harden setVectors against NaN values

This commit is contained in:
Phillip Stephens 2020-09-27 14:36:18 -07:00
parent 63a58858e8
commit 69bc5dd69f
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Emitter.cpp
View File

@ -67,7 +67,11 @@ void Emitter::_update() {
/* Calculate attenuation */ /* Calculate attenuation */
float att = _attenuationCurve(dist); float att = _attenuationCurve(dist);
att = (m_maxVol - m_minVol) * att + m_minVol; att = (m_maxVol - m_minVol) * att + m_minVol;
//if (!std::isnan(att)) {
att = m_attCache.getVolume(att, false); att = m_attCache.getVolume(att, false);
//} else {
//att = 0.f;
//}
if (att > FLT_EPSILON) { if (att > FLT_EPSILON) {
/* Apply pan law */ /* Apply pan law */
const std::array<float, 8> thisCoefs = m_vox->_panLaw(frontPan, backPan, span); const std::array<float, 8> thisCoefs = m_vox->_panLaw(frontPan, backPan, span);
@ -105,8 +109,16 @@ void Emitter::_update() {
void Emitter::setVectors(const float* pos, const float* dir) { void Emitter::setVectors(const float* pos, const float* dir) {
for (size_t i = 0; i < m_pos.size(); ++i) { for (size_t i = 0; i < m_pos.size(); ++i) {
if (!std::isnan(pos[i])) {
m_pos[i] = pos[i]; m_pos[i] = pos[i];
} else {
m_pos[i] = 0.f;
}
if (!std::isnan(dir[i])) {
m_dir[i] = dir[i]; m_dir[i] = dir[i];
} else {
m_dir[i] = 0.f;
}
} }
m_dirty = true; m_dirty = true;
} }