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

Attenuation coefficients parsing

Browse source
This commit is contained in:
Atlante45 2014-10-09 16:41:48 -07:00
parent fb520bf47f
commit 90c5c7f43c
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -989,7 +989,41 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin); glm::vec3 dimension(xMax - xMin, yMax - yMin, zMax - zMin);
AABox zoneAABox(corner, dimension); AABox zoneAABox(corner, dimension);
_audioZones.insert(zone, zoneAABox); _audioZones.insert(zone, zoneAABox);
qDebug() << "Added zone:" << zoneAABox; qDebug() << "Added zone:" << zone << zoneAABox;
}
}
}
}
}
const QString ATTENUATION_COEFFICIENTS = "attenuation_coefficients";
if (audioEnvGroupObject[ATTENUATION_COEFFICIENTS].isArray()) {
const QJsonArray& coefficients = audioEnvGroupObject[ATTENUATION_COEFFICIENTS].toArray();
const QString SOURCE = "source";
const QString LISTENER = "listener";
const QString COEFFICIENT = "coefficient";
for (int i = 0; i < coefficients.count(); ++i) {
QJsonObject coefficientObject = coefficients[i].toObject();
if (coefficientObject.contains(SOURCE) &&
coefficientObject.contains(LISTENER) &&
coefficientObject.contains(COEFFICIENT)) {
bool ok;
QString source = coefficientObject.value(SOURCE).toString();
QString listener = coefficientObject.value(LISTENER).toString();
float coefficient = coefficientObject.value(COEFFICIENT).toString().toFloat(&ok);
if (ok && coefficient >= 0.0f && coefficient <= 1.0f &&
_audioZones.contains(source) && _audioZones.contains(listener)) {
if (!_attenuationCoefficients.contains(source)) {
_attenuationCoefficients.insert(source, QHash<QString, float>());
}
if (!_attenuationCoefficients[source].contains(listener)) {
_attenuationCoefficients[source].insert(listener, coefficient);
qDebug() << "Added Coefficient:" << source << listener << coefficient;
} }
} }
} }
@ -997,3 +1031,5 @@ void AudioMixer::parseSettingsObject(const QJsonObject &settingsObject) {
} }
} }
} }

1
assignment-client/src/audio/AudioMixer.h
View file

@ -75,6 +75,7 @@ private:
int _sumListeners; int _sumListeners;
int _sumMixes; int _sumMixes;
QHash<QString, AABox> _audioZones; QHash<QString, AABox> _audioZones;
QHash<QString, QHash<QString, float> > _attenuationCoefficients;
static InboundAudioStream::Settings _streamSettings; static InboundAudioStream::Settings _streamSettings;