Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:39:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

code review comments

Browse source
This commit is contained in:
Craig Hansen-Sturm 2014-09-04 22:57:02 -07:00
parent fe0b9825d0
commit fc0a206985
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assignment-client/src/audio/AudioMixer.cpp
View file

@ -319,15 +319,15 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream*
glm::normalize(rotatedSourcePosition), glm::normalize(rotatedSourcePosition),
glm::vec3(0.0f, 1.0f, 0.0f)); glm::vec3(0.0f, 1.0f, 0.0f));
// if the source is in the range [-pi/2,+pi/2] (e.g, -Z from the listener's perspective // if the source is in the range (-pi/2,+pi/2) (e.g, -Z from the listener's perspective
if (bearingRelativeAngleToSource <= -PI_OVER_TWO || bearingRelativeAngleToSource >= PI_OVER_TWO) if (bearingRelativeAngleToSource < -PI_OVER_TWO || bearingRelativeAngleToSource > PI_OVER_TWO)
{ {
AudioFilterHSF1s& penumbraFilter = streamToAdd->getFilter(); AudioFilterHSF1s& penumbraFilter = streamToAdd->getFilter();
const float FULL_POWER = 1.0f; const float FULL_POWER = 1.0f;
const float SQUARE_ROOT_OF_TWO_OVER_TWO = 0.71f; const float SQUARE_ROOT_OF_TWO_OVER_TWO = 0.71f;
const float HALF_POWER = SQUARE_ROOT_OF_TWO_OVER_TWO; const float HALF_POWER = SQUARE_ROOT_OF_TWO_OVER_TWO;
const float QUARTER_POWER = /*HALF_POWER * */HALF_POWER; const float QUARTER_POWER = HALF_POWER * HALF_POWER;
const float ONE_OVER_TWO_PI = 1.0f / TWO_PI; const float ONE_OVER_TWO_PI = 1.0f / TWO_PI;
const float FILTER_CUTOFF_FREQUENCY_HZ = 1000.0f; const float FILTER_CUTOFF_FREQUENCY_HZ = 1000.0f;
@ -341,11 +341,11 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream*
((+1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource - PI)) + HALF_POWER); ((+1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource - PI)) + HALF_POWER);
const float penumbraFilterGainR = (bearingRelativeAngleToSource <= -PI_OVER_TWO) ? const float penumbraFilterGainR = (bearingRelativeAngleToSource <= -PI_OVER_TWO) ?
((-1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource + PI_OVER_TWO)) + QUARTER_POWER) : ((-1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource + PI_OVER_TWO)) + HALF_POWER) :
((-1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource - PI)) + HALF_POWER); ((-1.0 * ONE_OVER_TWO_PI * (bearingRelativeAngleToSource - PI)) + HALF_POWER);
float distanceBetween = glm::length(relativePosition); float distanceBetween = glm::length(relativePosition);
#if 0
qDebug() << "avatar=" qDebug() << "avatar="
<< listeningNodeStream << listeningNodeStream
<< "gainL=" << "gainL="
@ -356,7 +356,7 @@ int AudioMixer::addStreamToMixForListeningNodeWithStream(PositionalAudioStream*
<< bearingRelativeAngleToSource << bearingRelativeAngleToSource
<< "dist=" << "dist="
<< distanceBetween; << distanceBetween;
#endif
// set the gain on both filter channels // set the gain on both filter channels
penumbraFilter.setParameters(0, 0, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGainL, penumbraFilterSlope); penumbraFilter.setParameters(0, 0, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGainL, penumbraFilterSlope);
penumbraFilter.setParameters(0, 1, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGainR, penumbraFilterSlope); penumbraFilter.setParameters(0, 1, SAMPLE_RATE, penumbraFilterFrequency, penumbraFilterGainR, penumbraFilterSlope);