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

use fred's fancy new formula for distance attenuation

Browse source
This commit is contained in:
Stephen Birarda 2013-03-06 14:13:27 -08:00
parent e16cd4ffc3
commit f27af9c903
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mixer/src/main.cpp
View file

@ -101,7 +101,7 @@ void *sendBuffer(void *args)
powf(agentPosition[1] - otherAgentPosition[1], 2) + powf(agentPosition[1] - otherAgentPosition[1], 2) +
powf(agentPosition[2] - otherAgentPosition[2], 2)); powf(agentPosition[2] - otherAgentPosition[2], 2));
distanceCoeffs[lowAgentIndex][highAgentIndex] = std::max(1.0f, powf((logf(DISTANCE_RATIO * distanceToAgent) / logf(3)), 2)); distanceCoeffs[lowAgentIndex][highAgentIndex] = std::min(1.0f, powf(0.5, (logf(DISTANCE_RATIO * distanceToAgent) / logf(3)) - 1));
} }
@ -149,11 +149,11 @@ void *sendBuffer(void *args)
if (s < numSamplesDelay) { if (s < numSamplesDelay) {
// pull the earlier sample for the delayed channel // pull the earlier sample for the delayed channel
int earlierSample = delaySamplePointer[s] / distanceCoeffs[lowAgentIndex][highAgentIndex]; int earlierSample = delaySamplePointer[s] * distanceCoeffs[lowAgentIndex][highAgentIndex];
delayedChannel[s] = earlierSample; delayedChannel[s] = earlierSample;
} }
int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] / distanceCoeffs[lowAgentIndex][highAgentIndex]); int16_t currentSample = (otherAgentBuffer->getNextOutput()[s] * distanceCoeffs[lowAgentIndex][highAgentIndex]);
goodChannel[s] = currentSample; goodChannel[s] = currentSample;
if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) { if (s + numSamplesDelay < BUFFER_LENGTH_SAMPLES_PER_CHANNEL) {
@ -200,8 +200,8 @@ void *reportAliveToDS(void *args) {
gettimeofday(&lastSend, NULL); gettimeofday(&lastSend, NULL);
*output = 'M'; *output = 'M';
packSocket(output + 1, 895283510, htons(MIXER_LISTEN_PORT)); // packSocket(output + 1, 895283510, htons(MIXER_LISTEN_PORT));
// packSocket(output + 1, 788637888, htons(MIXER_LISTEN_PORT)); packSocket(output + 1, 788637888, htons(MIXER_LISTEN_PORT));
agentList.getAgentSocket().send(DOMAIN_IP, DOMAINSERVER_PORT, output, 7); agentList.getAgentSocket().send(DOMAIN_IP, DOMAINSERVER_PORT, output, 7);
double usecToSleep = 1000000 - (usecTimestampNow() - usecTimestamp(&lastSend)); double usecToSleep = 1000000 - (usecTimestampNow() - usecTimestamp(&lastSend));