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

fix predelay in the diffusion case

Browse source
This commit is contained in:
ZappoMan 2014-04-14 12:32:23 -07:00
parent 0d308e7cb9
commit 5e42daaa51
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/audioReflectorTools.js
View file

@ -10,7 +10,7 @@
// //
var delayScale = 100.0; var delayScale = 500.0;
var fanoutScale = 10.0; var fanoutScale = 10.0;
var speedScale = 20; var speedScale = 20;
var factorScale = 5.0; var factorScale = 5.0;

20
interface/src/AudioReflector.cpp
View file

@ -407,7 +407,14 @@ void AudioReflector::injectAudiblePoint(const AudioPoint& audiblePoint,
float rightEarDelayMsecs = getDelayFromDistance(rightEarDistance) + audiblePoint.delay; float rightEarDelayMsecs = getDelayFromDistance(rightEarDistance) + audiblePoint.delay;
float leftEarDelayMsecs = getDelayFromDistance(leftEarDistance) + audiblePoint.delay; float leftEarDelayMsecs = getDelayFromDistance(leftEarDistance) + audiblePoint.delay;
/*
qDebug() << "injectAudiblePoint()... ";
qDebug() << " audiblePoint.delay=" << audiblePoint.delay;
qDebug() << " rightEarDelayMsecs=" << rightEarDelayMsecs;
qDebug() << " leftEarDelayMsecs=" << leftEarDelayMsecs;
*/
_totalDelay += rightEarDelayMsecs + leftEarDelayMsecs; _totalDelay += rightEarDelayMsecs + leftEarDelayMsecs;
_delayCount += 2; _delayCount += 2;
_maxDelay = std::max(_maxDelay,rightEarDelayMsecs); _maxDelay = std::max(_maxDelay,rightEarDelayMsecs);
@ -700,7 +707,7 @@ void AudioReflector::analyzePaths() {
float initialAttenuation = 1.0f; float initialAttenuation = 1.0f;
float preDelay = Menu::getInstance()->isOptionChecked(MenuOption::AudioSpatialProcessingPreDelay) ? _preDelay : 0.0f; float preDelay = Menu::getInstance()->isOptionChecked(MenuOption::AudioSpatialProcessingPreDelay) ? _preDelay : 0.0f;
addSoundSource(_origin, right, initialAttenuation, preDelay); addSoundSource(_origin, right, initialAttenuation, preDelay);
addSoundSource(_origin, front, initialAttenuation, preDelay); addSoundSource(_origin, front, initialAttenuation, preDelay);
addSoundSource(_origin, up, initialAttenuation, preDelay); addSoundSource(_origin, up, initialAttenuation, preDelay);
@ -758,7 +765,6 @@ int AudioReflector::analyzePathsSingleStep() {
float currentAttenuation = path->lastAttenuation; float currentAttenuation = path->lastAttenuation;
float currentDelay = path->lastDelay; // start with our delay so far float currentDelay = path->lastDelay; // start with our delay so far
float pathDistance = path->lastDistance; float pathDistance = path->lastDistance;
float totalDelay = path->lastDelay; // start with our delay so far
if (!path->finalized) { if (!path->finalized) {
activePaths++; activePaths++;
@ -784,7 +790,6 @@ int AudioReflector::analyzePathsSingleStep() {
// We aren't using this... should we be???? // We aren't using this... should we be????
float toListenerDistance = glm::distance(end, _listenerPosition); float toListenerDistance = glm::distance(end, _listenerPosition);
float totalDistance = toListenerDistance + pathDistance;
// adjust our current delay by just the delay from the most recent ray // adjust our current delay by just the delay from the most recent ray
currentDelay += getDelayFromDistance(distance); currentDelay += getDelayFromDistance(distance);
@ -801,7 +806,7 @@ int AudioReflector::analyzePathsSingleStep() {
float partialDiffusionAttenuation = _diffusionFanout < 1 ? 0.0f : totalDiffusionAttenuation / _diffusionFanout; float partialDiffusionAttenuation = _diffusionFanout < 1 ? 0.0f : totalDiffusionAttenuation / _diffusionFanout;
// total delay includes the bounce back to listener // total delay includes the bounce back to listener
totalDelay = getDelayFromDistance(totalDistance); float totalDelay = currentDelay + getDelayFromDistance(toListenerDistance);
float toListenerAttenuation = getDistanceAttenuationCoefficient(toListenerDistance); float toListenerAttenuation = getDistanceAttenuationCoefficient(toListenerDistance);
// if our resulting partial diffusion attenuation, is still above our minimum attenuation // if our resulting partial diffusion attenuation, is still above our minimum attenuation
@ -862,7 +867,10 @@ int AudioReflector::analyzePathsSingleStep() {
&& totalDelay < MAXIMUM_DELAY_MS) { && totalDelay < MAXIMUM_DELAY_MS) {
// add this location, as the reflective attenuation as well as the total diffusion attenuation // add this location, as the reflective attenuation as well as the total diffusion attenuation
AudioPoint point = { end, totalDelay, reflectiveAttenuation + totalDiffusionAttenuation }; // NOTE: we add the delay to the audible point, not back to the listener. The additional delay
// and attenuation to the listener is recalculated at the point where we actually inject the
// audio so that it can be adjusted to ear position
AudioPoint point = { end, currentDelay, reflectiveAttenuation + totalDiffusionAttenuation };
_audiblePoints.push_back(point); _audiblePoints.push_back(point);
// add this location to the path points, so we can visualize it // add this location to the path points, so we can visualize it