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

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

Browse source
This commit is contained in:
ZappoMan 2014-09-10 10:45:57 -07:00
commit d4dad8f4d8
6 changed files with 85 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/leapOfFaith.js
View file

@ -255,4 +255,8 @@ Script.update.connect(function(deltaTime) {
});
Script.scriptEnding.connect(function() {
var i;
for (i = 0; i < jointControllers.length; i += 1) {
Controller.releaseInputController(jointControllers[i].c);
}
});

2
interface/src/Audio.cpp
View file

@ -431,7 +431,7 @@ void Audio::start() {
qDebug() << "Unable to set up audio output because of a problem with output format.";
}
_inputFrameBuffer.initialize( _inputFormat.channelCount(), _audioInput->bufferSize() * 4 );
_inputFrameBuffer.initialize( _inputFormat.channelCount(), _audioInput->bufferSize() * 8 );
_peq.initialize( _inputFormat.sampleRate() );
_inputGain.initialize();
_sourceGain.initialize();

4
interface/src/scripting/ControllerScriptingInterface.cpp
View file

@ -297,6 +297,10 @@ AbstractInputController* ControllerScriptingInterface::createInputController(con
}
}
void ControllerScriptingInterface::releaseInputController(AbstractInputController* input) {
_inputControllers.erase(input->getKey());
}
void ControllerScriptingInterface::updateInputControllers() {
//TODO C++11 for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
for (InputControllerMap::iterator it = _inputControllers.begin(); it != _inputControllers.end(); it++) {

4
interface/src/scripting/ControllerScriptingInterface.h
View file

@ -76,8 +76,6 @@ public:
void updateInputControllers();
void releaseInputController(AbstractInputController* input);
public slots:
virtual bool isPrimaryButtonPressed() const;
virtual glm::vec2 getPrimaryJoystickPosition() const;
@ -116,6 +114,8 @@ public slots:
/// Factory to create an InputController
virtual AbstractInputController* createInputController(const QString& deviceName, const QString& tracker);
virtual void releaseInputController(AbstractInputController* input);
private:
const PalmData* getPrimaryPalm() const;
const PalmData* getPalm(int palmIndex) const;

106
libraries/audio/src/AudioGain.h
View file

@ -55,40 +55,78 @@ public:
}
float32_t** samples = frameBuffer.getFrameData();
for (uint16_t j = 0; j < frameBuffer.getChannelCount(); ++j) {
for (uint16_t i = 0; i < frameBuffer.getFrameCount(); i += 32) {
samples[j][i + 0] *= _gain;
samples[j][i + 1] *= _gain;
samples[j][i + 2] *= _gain;
samples[j][i + 3] *= _gain;
samples[j][i + 4] *= _gain;
samples[j][i + 5] *= _gain;
samples[j][i + 6] *= _gain;
samples[j][i + 7] *= _gain;
samples[j][i + 8] *= _gain;
samples[j][i + 9] *= _gain;
samples[j][i + 10] *= _gain;
samples[j][i + 11] *= _gain;
samples[j][i + 12] *= _gain;
samples[j][i + 13] *= _gain;
samples[j][i + 14] *= _gain;
samples[j][i + 15] *= _gain;
samples[j][i + 16] *= _gain;
samples[j][i + 17] *= _gain;
samples[j][i + 18] *= _gain;
samples[j][i + 19] *= _gain;
samples[j][i + 20] *= _gain;
samples[j][i + 21] *= _gain;
samples[j][i + 22] *= _gain;
samples[j][i + 23] *= _gain;
samples[j][i + 24] *= _gain;
samples[j][i + 25] *= _gain;
samples[j][i + 26] *= _gain;
samples[j][i + 27] *= _gain;
samples[j][i + 28] *= _gain;
samples[j][i + 29] *= _gain;
samples[j][i + 30] *= _gain;
samples[j][i + 31] *= _gain;
bool frameAlignment16 = (frameBuffer.getFrameCount() & 0x0F) == 0;
if (frameAlignment16) {
if (frameBuffer.getChannelCount() == 1) {
for (uint16_t i = 0; i < frameBuffer.getFrameCount(); i += 16) {
samples[0][i + 0] *= _gain;
samples[0][i + 1] *= _gain;
samples[0][i + 2] *= _gain;
samples[0][i + 3] *= _gain;
samples[0][i + 4] *= _gain;
samples[0][i + 5] *= _gain;
samples[0][i + 6] *= _gain;
samples[0][i + 7] *= _gain;
samples[0][i + 8] *= _gain;
samples[0][i + 9] *= _gain;
samples[0][i + 10] *= _gain;
samples[0][i + 11] *= _gain;
samples[0][i + 12] *= _gain;
samples[0][i + 13] *= _gain;
samples[0][i + 14] *= _gain;
samples[0][i + 15] *= _gain;
}
}
else if (frameBuffer.getChannelCount() == 2) {
for (uint16_t i = 0; i < frameBuffer.getFrameCount(); i += 16) {
samples[0][i + 0] *= _gain;
samples[0][i + 1] *= _gain;
samples[0][i + 2] *= _gain;
samples[0][i + 3] *= _gain;
samples[0][i + 4] *= _gain;
samples[0][i + 5] *= _gain;
samples[0][i + 6] *= _gain;
samples[0][i + 7] *= _gain;
samples[0][i + 8] *= _gain;
samples[0][i + 9] *= _gain;
samples[0][i + 10] *= _gain;
samples[0][i + 11] *= _gain;
samples[0][i + 12] *= _gain;
samples[0][i + 13] *= _gain;
samples[0][i + 14] *= _gain;
samples[0][i + 15] *= _gain;
samples[1][i + 0] *= _gain;
samples[1][i + 1] *= _gain;
samples[1][i + 2] *= _gain;
samples[1][i + 3] *= _gain;
samples[1][i + 4] *= _gain;
samples[1][i + 5] *= _gain;
samples[1][i + 6] *= _gain;
samples[1][i + 7] *= _gain;
samples[1][i + 8] *= _gain;
samples[1][i + 9] *= _gain;
samples[1][i + 10] *= _gain;
samples[1][i + 11] *= _gain;
samples[1][i + 12] *= _gain;
samples[1][i + 13] *= _gain;
samples[1][i + 14] *= _gain;
samples[1][i + 15] *= _gain;
}
}
else {
assert("unsupported channel format");
}
}
else {
for (uint16_t j = 0; j < frameBuffer.getChannelCount(); ++j) {
for (uint16_t i = 0; i < frameBuffer.getFrameCount(); i += 1) {
samples[j][i] *= _gain;
}
}
}
}

2
libraries/shared/src/LogUtils.cpp
View file

@ -9,6 +9,8 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <QtGlobal>
#include "LogUtils.h"
void LogUtils::init() {