Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-05 01:44:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean up from previous commit

Browse source
This commit is contained in:
bwent 2015-07-15 11:41:26 -07:00
parent 5b0b7229ba
commit 2c24251b52
3 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -107,7 +107,6 @@
#include "avatar/AvatarManager.h"
#include "audio/AudioToolBox.h"
//#include "audio/AudioIOStatsRenderer.h"
#include "audio/AudioScope.h"
#include "devices/CameraToolBox.h"
@ -274,7 +273,6 @@ bool setupEssentials(int& argc, char** argv) {
auto faceshift = DependencyManager::set<Faceshift>();
auto audio = DependencyManager::set<AudioClient>();
auto audioScope = DependencyManager::set<AudioScope>();
// auto audioIOStatsRenderer = DependencyManager::set<AudioIOStatsRenderer>();
auto deferredLightingEffect = DependencyManager::set<DeferredLightingEffect>();
auto ambientOcclusionEffect = DependencyManager::set<AmbientOcclusionEffect>();
auto textureCache = DependencyManager::set<TextureCache>();

14
interface/src/Menu.cpp
View file

@ -581,20 +581,6 @@ Menu::Menu() {
audioScopeFramesGroup->addAction(fiftyFrames);
}
// auto statsRenderer = DependencyManager::get<AudioIOStatsRenderer>();
// addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStats,
// Qt::CTRL | Qt::SHIFT | Qt::Key_A,
// false,
// statsRenderer.data(),
// SLOT(toggle()));
// addCheckableActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioStatsShowInjectedStreams,
// 0,
// false,
// statsRenderer.data(),
// SLOT(toggleShowInjectedStreams()));
//
MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");
addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);
addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowHulls);

4
interface/src/ui/ApplicationOverlay.cpp
View file

@ -23,7 +23,6 @@
#include <OffscreenUi.h>
#include "AudioClient.h"
//#include "audio/AudioIOStatsRenderer.h"
#include "audio/AudioScope.h"
#include "audio/AudioToolBox.h"
#include "Application.h"
@ -935,7 +934,6 @@ void ApplicationOverlay::renderAudioMeter() {
auto canvasSize = qApp->getCanvasSize();
DependencyManager::get<AudioScope>()->render(canvasSize.x, canvasSize.y);
//DependencyManager::get<AudioIOStatsRenderer>()->render(WHITE_TEXT, canvasSize.x, canvasSize.y);
audioMeterY += AUDIO_METER_HEIGHT;
@ -995,6 +993,8 @@ void ApplicationOverlay::renderAudioMeter() {
void ApplicationOverlay::renderStatsAndLogs() {
Application* application = Application::getInstance();
SharedNodePointer audioMixerNodePointer = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::AudioMixer);
QSharedPointer<BandwidthRecorder> bandwidthRecorder = DependencyManager::get<BandwidthRecorder>();
const OctreePacketProcessor& octreePacketProcessor = application->getOctreePacketProcessor();