Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 18:42:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

calculate angle between agent and other sources to prep for phase delay

Browse source
This commit is contained in:
Stephen Birarda 2013-02-28 17:50:17 -08:00
parent a42fc47231
commit 400cb238f2
3 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
mixer/src/main.cpp
View file

@ -80,17 +80,40 @@ void *sendBuffer(void *args)
for (int j = 0; j < agentList.getAgents().size(); j++) {
if (i == j) {
AudioRingBuffer *agentRingBuffer = (AudioRingBuffer *) agent->getLinkedData();
AudioRingBuffer *otherAgentBuffer = (AudioRingBuffer *)agentList.getAgents()[j].getLinkedData();
// float *agentPosition = ((AudioRingBuffer *)agent->getLinkedData())->getPosition();
// float *otherAgentPosition = otherAgentBuffer->getPosition();
//
// float distanceToAgent = sqrtf(powf(agentPosition[0] - otherAgentPosition[0], 2) +
// powf(agentPosition[1] - otherAgentPosition[1], 2) +
// powf(agentPosition[2] - otherAgentPosition[2], 2));
//
// float distanceCoeff = powf((logf(DISTANCE_RATIO * distanceToAgent) / logf(3)), 2);
float distanceCoeff = 1;
float *agentPosition = agentRingBuffer->getPosition();
float otherAgentPosition[3] = {0,0,0};
// calculate the distance to the other agent
float distanceToAgent = sqrtf(powf(agentPosition[0] - otherAgentPosition[0], 2) +
powf(agentPosition[1] - otherAgentPosition[1], 2) +
powf(agentPosition[2] - otherAgentPosition[2], 2));
// use the distance to the other agent to calculate the change in volume for this frame
float distanceCoeff = powf((logf(DISTANCE_RATIO * distanceToAgent) / logf(3)), 2);
// get the angle from the right-angle triangle
float triangleAngle = atan2f(fabsf(agentPosition[2] - otherAgentPosition[2]), fabsf(agentPosition[0] - otherAgentPosition[0])) * (180 / M_PI);
float angleToSource;
float agentBearing = agentRingBuffer->getBearing();
// find the angle we need for calculation based on the orientation of the triangle
if (otherAgentPosition[0] > agentPosition[0]) {
if (otherAgentPosition[2] > agentPosition[2]) {
angleToSource = -90 + triangleAngle - agentBearing;
} else {
angleToSource = -90 - triangleAngle - agentBearing;
}
} else {
if (otherAgentPosition[2] > agentPosition[2]) {
angleToSource = 90 - triangleAngle - agentBearing;
} else {
angleToSource = 90 + triangleAngle - agentBearing;
}
}
for (int s = 0; s < BUFFER_LENGTH_SAMPLES_PER_CHANNEL; s++) {
int16_t sample = (otherAgentBuffer->getNextOutput()[s] / distanceCoeff);

8
shared/src/AudioRingBuffer.cpp
View file

@ -89,6 +89,14 @@ void AudioRingBuffer::setPosition(float *newPosition) {
position[2] = newPosition[2];
}
float AudioRingBuffer::getBearing() {
return bearing;
}
void AudioRingBuffer::setBearing(float newBearing) {
bearing = newBearing;
}
void AudioRingBuffer::parseData(void *data, int size) {
unsigned char *audioDataStart = (unsigned char *) data;

2
shared/src/AudioRingBuffer.h
View file

@ -34,7 +34,7 @@ class AudioRingBuffer : public AgentData {
float* getPosition();
void setPosition(float newPosition[]);
float getBearing();
float setBearing(float newBearing);
void setBearing(float newBearing);
short diffLastWriteNextOutput();
private: