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

Merge branch 'master' of https://github.com/highfidelity/hifi into perListenerSourcePairMixerData

Browse source
This commit is contained in:
ZappoMan 2014-09-18 17:05:48 -07:00
commit 7fc7eeb0a1
6 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/settings/describe.json
View file

@ -67,7 +67,7 @@
"type": "checkbox",
"label": "Enable Positional Filter",
"help": "If enabled, positional audio stream uses lowpass filter",
"default": true
"default": false
}
}
}

2
examples/editVoxels.js
View file

@ -1110,7 +1110,7 @@ function keyPressEvent(event) {
print("Color = " + (whichColor + 1));
swatchesSound.play(whichColor);
moveTools();
} else if (event.text == "0") {
} else if (event.text == "0" && voxelToolSelected) {
// Create a brand new 1 meter voxel in front of your avatar
var newPosition = getNewVoxelPosition();
var newVoxel = {

2
libraries/audio/src/AudioFilter.h
View file

@ -75,6 +75,8 @@ public:
- (_b1 * _ym1)
- (_b2 * _ym2);
y = (y >= -EPSILON && y < EPSILON) ? 0.0f : y; // clamp to 0
// update delay line
_xm2 = _xm1;
_xm1 = x;

4
libraries/audio/src/AudioSourceTone.cpp
View file

@ -40,8 +40,8 @@ void AudioSourceTone::updateCoefficients() {
void AudioSourceTone::initialize() {
const float32_t FREQUENCY_220_HZ = 220.0f;
const float32_t GAIN_MINUS_3DB = 0.708f;
setParameters(SAMPLE_RATE, FREQUENCY_220_HZ, GAIN_MINUS_3DB);
const float32_t GAIN_MINUS_6DB = 0.501f;
setParameters(SAMPLE_RATE, FREQUENCY_220_HZ, GAIN_MINUS_6DB);
}
void AudioSourceTone::setParameters(const float32_t sampleRate, const float32_t frequency, const float32_t amplitude) {

2
libraries/avatars/src/Player.cpp
View file

@ -203,7 +203,7 @@ void Player::play() {
head->setFinalPitch(eulers.x);
head->setFinalYaw(eulers.y);
head->setFinalRoll(eulers.z);
head->setLookAtPosition(currentFrame.getLookAtPosition());
head->setLookAtPosition(context->position + context->orientation * currentFrame.getLookAtPosition());
} else {
qDebug() << "WARNING: Player couldn't find head data.";
}

2
libraries/fbx/src/FBXReader.cpp
View file

@ -1769,7 +1769,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
lowestWeight = weights[k];
}
}
if (k == 4) {
if (k == 4 && weight > lowestWeight) {
// no space for an additional weight; we must replace the lowest
weights[lowestIndex] = weight;
extracted.mesh.clusterIndices[it.value()][lowestIndex] = i;