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

Use sqrt() in pan law

This commit is contained in:
Jack Andersen 2017-11-28 00:05:59 -10:00
parent b890a76e20
commit 89233e98b5
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/amuse/Voice.hpp
View File

@ -82,8 +82,8 @@ class Voice : public Entity
float m_curAuxBVol = 0.f; /**< Current AuxB volume of voice */ float m_curAuxBVol = 0.f; /**< Current AuxB volume of voice */
float m_userPan = 0.f; /**< User pan of voice */ float m_userPan = 0.f; /**< User pan of voice */
float m_curPan = 0.f; /**< Current pan of voice */ float m_curPan = 0.f; /**< Current pan of voice */
float m_userSpan = 0.f; /**< User span of voice */ float m_userSpan = -1.f; /**< User span of voice */
float m_curSpan = 0.f; /**< Current surround pan of voice */ float m_curSpan = -1.f; /**< Current surround pan of voice */
float m_curPitchWheel = 0.f; /**< Current normalized wheel value for control */ float m_curPitchWheel = 0.f; /**< Current normalized wheel value for control */
int32_t m_pitchWheelUp = 600; /**< Up range for pitchwheel control in cents */ int32_t m_pitchWheelUp = 600; /**< Up range for pitchwheel control in cents */
int32_t m_pitchWheelDown = 600; /**< Down range for pitchwheel control in cents */ int32_t m_pitchWheelDown = 600; /**< Down range for pitchwheel control in cents */

20
lib/Voice.cpp
View File

@ -979,10 +979,10 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
case AudioChannelSet::Stereo: case AudioChannelSet::Stereo:
default: default:
/* Left */ /* Left */
coefs[0] = -frontPan * 0.5f + 0.5f; coefs[0] = std::sqrt(-frontPan * 0.5f + 0.5f);
/* Right */ /* Right */
coefs[1] = frontPan * 0.5f + 0.5f; coefs[1] = std::sqrt(frontPan * 0.5f + 0.5f);
break; break;
@ -990,18 +990,22 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
/* Left */ /* Left */
coefs[0] = -frontPan * 0.5f + 0.5f; coefs[0] = -frontPan * 0.5f + 0.5f;
coefs[0] *= -totalSpan * 0.5f + 0.5f; coefs[0] *= -totalSpan * 0.5f + 0.5f;
coefs[0] = std::sqrt(coefs[0]);
/* Right */ /* Right */
coefs[1] = frontPan * 0.5f + 0.5f; coefs[1] = frontPan * 0.5f + 0.5f;
coefs[1] *= -totalSpan * 0.5f + 0.5f; coefs[1] *= -totalSpan * 0.5f + 0.5f;
coefs[1] = std::sqrt(coefs[1]);
/* Back Left */ /* Back Left */
coefs[2] = -backPan * 0.5f + 0.5f; coefs[2] = -backPan * 0.5f + 0.5f;
coefs[2] *= totalSpan * 0.5f + 0.5f; coefs[2] *= totalSpan * 0.5f + 0.5f;
coefs[2] = std::sqrt(coefs[2]);
/* Back Right */ /* Back Right */
coefs[3] = backPan * 0.5f + 0.5f; coefs[3] = backPan * 0.5f + 0.5f;
coefs[3] *= totalSpan * 0.5f + 0.5f; coefs[3] *= totalSpan * 0.5f + 0.5f;
coefs[3] = std::sqrt(coefs[3]);
break; break;
@ -1009,22 +1013,27 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
/* Left */ /* Left */
coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f; coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f;
coefs[0] *= -totalSpan * 0.5f + 0.5f; coefs[0] *= -totalSpan * 0.5f + 0.5f;
coefs[0] = std::sqrt(coefs[0]);
/* Right */ /* Right */
coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f; coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f;
coefs[1] *= -totalSpan * 0.5f + 0.5f; coefs[1] *= -totalSpan * 0.5f + 0.5f;
coefs[1] = std::sqrt(coefs[1]);
/* Back Left */ /* Back Left */
coefs[2] = -backPan * 0.5f + 0.5f; coefs[2] = -backPan * 0.5f + 0.5f;
coefs[2] *= totalSpan * 0.5f + 0.5f; coefs[2] *= totalSpan * 0.5f + 0.5f;
coefs[2] = std::sqrt(coefs[2]);
/* Back Right */ /* Back Right */
coefs[3] = backPan * 0.5f + 0.5f; coefs[3] = backPan * 0.5f + 0.5f;
coefs[3] *= totalSpan * 0.5f + 0.5f; coefs[3] *= totalSpan * 0.5f + 0.5f;
coefs[3] = std::sqrt(coefs[3]);
/* Center */ /* Center */
coefs[4] = 1.f - std::fabs(frontPan); coefs[4] = 1.f - std::fabs(frontPan);
coefs[4] *= -totalSpan * 0.5f + 0.5f; coefs[4] *= -totalSpan * 0.5f + 0.5f;
coefs[4] = std::sqrt(coefs[4]);
/* LFE */ /* LFE */
coefs[5] = 0.25f; coefs[5] = 0.25f;
@ -1035,22 +1044,27 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
/* Left */ /* Left */
coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f; coefs[0] = (frontPan <= 0.f) ? -frontPan : 0.f;
coefs[0] *= (totalSpan <= 0.f) ? -totalSpan : 0.f; coefs[0] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
coefs[0] = std::sqrt(coefs[0]);
/* Right */ /* Right */
coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f; coefs[1] = (frontPan >= 0.f) ? frontPan : 0.f;
coefs[1] *= (totalSpan <= 0.f) ? -totalSpan : 0.f; coefs[1] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
coefs[1] = std::sqrt(coefs[1]);
/* Back Left */ /* Back Left */
coefs[2] = -backPan * 0.5f + 0.5f; coefs[2] = -backPan * 0.5f + 0.5f;
coefs[2] *= (totalSpan >= 0.f) ? totalSpan : 0.f; coefs[2] *= (totalSpan >= 0.f) ? totalSpan : 0.f;
coefs[2] = std::sqrt(coefs[2]);
/* Back Right */ /* Back Right */
coefs[3] = backPan * 0.5f + 0.5f; coefs[3] = backPan * 0.5f + 0.5f;
coefs[3] *= (totalSpan >= 0.f) ? totalSpan : 0.f; coefs[3] *= (totalSpan >= 0.f) ? totalSpan : 0.f;
coefs[3] = std::sqrt(coefs[3]);
/* Center */ /* Center */
coefs[4] = 1.f - std::fabs(frontPan); coefs[4] = 1.f - std::fabs(frontPan);
coefs[4] *= (totalSpan <= 0.f) ? -totalSpan : 0.f; coefs[4] *= (totalSpan <= 0.f) ? -totalSpan : 0.f;
coefs[4] = std::sqrt(coefs[4]);
/* LFE */ /* LFE */
coefs[5] = 0.25f; coefs[5] = 0.25f;
@ -1058,10 +1072,12 @@ void Voice::_panLaw(float coefs[8], float frontPan, float backPan, float totalSp
/* Side Left */ /* Side Left */
coefs[6] = -backPan * 0.5f + 0.5f; coefs[6] = -backPan * 0.5f + 0.5f;
coefs[6] *= 1.f - std::fabs(totalSpan); coefs[6] *= 1.f - std::fabs(totalSpan);
coefs[6] = std::sqrt(coefs[6]);
/* Side Right */ /* Side Right */
coefs[7] = backPan * 0.5f + 0.5f; coefs[7] = backPan * 0.5f + 0.5f;
coefs[7] *= 1.f - std::fabs(totalSpan); coefs[7] *= 1.f - std::fabs(totalSpan);
coefs[7] = std::sqrt(coefs[7]);
break; break;
} }