diff --git a/interface/interface_en.ts b/interface/interface_en.ts index 7c5d1ecbcf..a1abb57b52 100644 --- a/interface/interface_en.ts +++ b/interface/interface_en.ts @@ -4,22 +4,22 @@ Application - + Export Voxels - + Sparse Voxel Octree Files (*.svo) - + Open Script - + JavaScript Files (*.js) @@ -113,18 +113,18 @@ Menu - + Open .ini config file - - + + Text files (*.ini) - + Save .ini config file diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index dc1a843e47..fa1f4ae0a1 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1846,15 +1846,6 @@ void Application::updateDialogs(float deltaTime) { } } -void Application::updateAudio(float deltaTime) { - bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); - PerformanceWarning warn(showWarnings, "Application::updateAudio()"); - - // Update audio stats for procedural sounds - _audio.setLastAcceleration(_myAvatar->getThrust()); - _audio.setLastVelocity(_myAvatar->getVelocity()); -} - void Application::updateCursor(float deltaTime) { bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings); PerformanceWarning warn(showWarnings, "Application::updateCursor()"); @@ -1903,7 +1894,6 @@ void Application::update(float deltaTime) { updateMetavoxels(deltaTime); // update metavoxels updateCamera(deltaTime); // handle various camera tweaks like off axis projection updateDialogs(deltaTime); // update various stats dialogs if present - updateAudio(deltaTime); // Update audio stats for procedural sounds updateCursor(deltaTime); // Handle cursor updates _particles.update(); // update the particles... diff --git a/interface/src/Application.h b/interface/src/Application.h index fcf8810378..f638d947d9 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -312,7 +312,6 @@ private: void updateMetavoxels(float deltaTime); void updateCamera(float deltaTime); void updateDialogs(float deltaTime); - void updateAudio(float deltaTime); void updateCursor(float deltaTime); Avatar* findLookatTargetAvatar(glm::vec3& eyePosition, QUuid &nodeUUID); diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index dc34fb2e2d..312a6c5699 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -67,8 +67,6 @@ Audio::Audio(Oscilloscope* scope, int16_t initialJitterBufferSamples, QObject* p _noiseGateOpen(false), _noiseGateEnabled(true), _noiseGateFramesToClose(0), - _lastVelocity(0), - _lastAcceleration(0), _totalPacketsReceived(0), _collisionSoundMagnitude(0.0f), _collisionSoundFrequency(0.0f), diff --git a/interface/src/Audio.h b/interface/src/Audio.h index 0ffcb77baf..f98e18eb0b 100644 --- a/interface/src/Audio.h +++ b/interface/src/Audio.h @@ -51,10 +51,7 @@ public: float getAudioAverageInputLoudness() const { return _lastInputLoudness; } void setNoiseGateEnabled(bool noiseGateEnabled) { _noiseGateEnabled = noiseGateEnabled; } - - void setLastAcceleration(const glm::vec3 lastAcceleration) { _lastAcceleration = lastAcceleration; } - void setLastVelocity(const glm::vec3 lastVelocity) { _lastVelocity = lastVelocity; } - + void setJitterBufferSamples(int samples) { _jitterBufferSamples = samples; } int getJitterBufferSamples() { return _jitterBufferSamples; } @@ -139,8 +136,6 @@ private: bool _noiseGateOpen; bool _noiseGateEnabled; int _noiseGateFramesToClose; - glm::vec3 _lastVelocity; - glm::vec3 _lastAcceleration; int _totalPacketsReceived; float _collisionSoundMagnitude;