Merge branch 'master' into 20263

David Rowe committed 11 years ago

Commit 95efe982 parents ebe8007 89967fb109 files · +681 −487Browse files

Showing the changes to interface/src/Application.cpp (1 of 109 files). Show all

Unified · Split

 #include "Util.h"
 #include "audio/AudioToolBox.h"
+#include "audio/AudioIOStatsRenderer.h"
+#include "audio/AudioScope.h"
 #include "devices/DdeFaceTracker.h"
 #include "devices/Faceshift.h"
     }
 }
+bool setupEssentials(int& argc, char** argv) {
+    unsigned int listenPort = 0; // bind to an ephemeral port by default
+    const char** constArgv = const_cast<const char**>(argv);
+    const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
+    if (portStr) {
+        listenPort = atoi(portStr);
+    }
+    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
+    // Set dependencies
+    auto glCanvas = DependencyManager::set<GLCanvas>();
+    auto addressManager = DependencyManager::set<AddressManager>();
+    auto nodeList = DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
+    auto geometryCache = DependencyManager::set<GeometryCache>();
+    auto glowEffect = DependencyManager::set<GlowEffect>();
+    auto faceshift = DependencyManager::set<Faceshift>();
+    auto audio = DependencyManager::set<Audio>();
+    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>();
+    auto animationCache = DependencyManager::set<AnimationCache>();
+    auto visage = DependencyManager::set<Visage>();
+    auto ddeFaceTracker = DependencyManager::set<DdeFaceTracker>();
+    auto modelBlender = DependencyManager::set<ModelBlender>();
+    auto audioToolBox = DependencyManager::set<AudioToolBox>();
+    return true;
+}
 Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         QApplication(argc, argv),
+        _dependencyManagerIsSetup(setupEssentials(argc, argv)),
         _window(new MainWindow(desktop())),
         _toolWindow(NULL),
         _nodeThread(new QThread(this)),
         _isVSyncOn(true),
         _aboutToQuit(false)
 {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
+    auto nodeList = DependencyManager::get<NodeList>();
     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
     // read the ApplicationInfo.ini file for Name/Version/Domain information
     QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
     _window->setMenuBar(Menu::getInstance());
     _runningScriptsWidget = new RunningScriptsWidget(_window);
-    unsigned int listenPort = 0; // bind to an ephemeral port by default
-    const char** constArgv = const_cast<const char**>(argv);
-    const char* portStr = getCmdOption(argc, constArgv, "--listenPort");
-    if (portStr) {
-        listenPort = atoi(portStr);
-    }
     // start the nodeThread so its event loop is running
     _nodeThread->start();
     // make sure the node thread is given highest priority
     _nodeThread->setPriority(QThread::TimeCriticalPriority);
     // put the NodeList and datagram processing on the node thread
-    NodeList* nodeList = NodeList::createInstance(NodeType::Agent, listenPort);
     nodeList->moveToThread(_nodeThread);
     _datagramProcessor.moveToThread(_nodeThread);
     // put the audio processing on a separate thread
     QThread* audioThread = new QThread(this);
-    Audio::SharedPointer audioIO = DependencyManager::get<Audio>();
+    auto audioIO = DependencyManager::get<Audio>();
     audioIO->moveToThread(audioThread);
     connect(audioThread, &QThread::started, audioIO.data(), &Audio::start);
     connect(locationUpdateTimer, &QTimer::timeout, this, &Application::updateLocationInServer);
     locationUpdateTimer->start(DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS);
-    connect(nodeList, &NodeList::nodeAdded, this, &Application::nodeAdded);
+    connect(nodeList.data(), &NodeList::nodeAdded, this, &Application::nodeAdded);
-    connect(nodeList, &NodeList::nodeKilled, this, &Application::nodeKilled);
+    connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);
-    connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
+    connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
-    connect(nodeList, &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);
+    connect(nodeList.data(), &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);
-    connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
+    connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);
     // connect to appropriate slots on AccountManager
     AccountManager& accountManager = AccountManager::getInstance();
     // once the event loop has started, check and signal for an access token
     QMetaObject::invokeMethod(&accountManager, "checkAndSignalForAccessToken", Qt::QueuedConnection);
-    AddressManager::SharedPointer addressManager = DependencyManager::get<AddressManager>();
+    auto addressManager = DependencyManager::get<AddressManager>();
     // use our MyAvatar position and quat for address manager path
     addressManager->setPositionGetter(getPositionForPath);
     // move the silentNodeTimer to the _nodeThread
     QTimer* silentNodeTimer = new QTimer();
-    connect(silentNodeTimer, SIGNAL(timeout()), nodeList, SLOT(removeSilentNodes()));
+    connect(silentNodeTimer, SIGNAL(timeout()), nodeList.data(), SLOT(removeSilentNodes()));
     silentNodeTimer->start(NODE_SILENCE_THRESHOLD_MSECS);
     silentNodeTimer->moveToThread(_nodeThread);
     // kill any audio injectors that are still around
     AudioScriptingInterface::getInstance().stopAllInjectors();
-    Audio::SharedPointer audioIO = DependencyManager::get<Audio>();
+    auto audioIO = DependencyManager::get<Audio>();
     // stop the audio process
     QMetaObject::invokeMethod(audioIO.data(), "stop", Qt::BlockingQueuedConnection);
     Menu::getInstance()->deleteLater();
     _myAvatar = NULL;
+    DependencyManager::destroy<GLCanvas>();
 }
 void Application::saveSettings() {
     foreach(NodeType_t type, destinationNodeTypes) {
         // Perform the broadcast for one type
-        int nReceivingNodes = NodeList::getInstance()->broadcastToNodes(packet, NodeSet() << type);
+        int nReceivingNodes = DependencyManager::get<NodeList>()->broadcastToNodes(packet, NodeSet() << type);
         // Feed number of bytes to corresponding channel of the bandwidth meter, if any (done otherwise)
         BandwidthMeter::ChannelIndex channel;
                 if (isShifted) {
                     _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() - 0.1f);
                     if (TV3DManager::isConnected()) {
-                        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+                        auto glCanvas = DependencyManager::get<GLCanvas>();
                         TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
                     }
                 } else {
                 if (isShifted) {
                     _viewFrustum.setFocalLength(_viewFrustum.getFocalLength() + 0.1f);
                     if (TV3DManager::isConnected()) {
-                        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+                        auto glCanvas = DependencyManager::get<GLCanvas>();
                         TV3DManager::configureCamera(_myCamera, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
                     }
     SnapshotMetaData* snapshotData = Snapshot::parseSnapshotData(snapshotPath);
     if (snapshotData) {
         if (!snapshotData->getDomain().isEmpty()) {
-            NodeList::getInstance()->getDomainHandler().setHostnameAndPort(snapshotData->getDomain());
+            DependencyManager::get<NodeList>()->getDomainHandler().setHostnameAndPort(snapshotData->getDomain());
         }
         _myAvatar->setPosition(snapshotData->getLocation());
 }
 void Application::sendPingPackets() {
-    QByteArray pingPacket = NodeList::getInstance()->constructPingPacket();
+    QByteArray pingPacket = DependencyManager::get<NodeList>()->constructPingPacket();
     controlledBroadcastToNodes(pingPacket, NodeSet()
                                << NodeType::EntityServer
                                << NodeType::AudioMixer << NodeType::AvatarMixer
     _timerStart.start();
     // ask the node list to check in with the domain server
-    NodeList::getInstance()->sendDomainServerCheckIn();
+    DependencyManager::get<NodeList>()->sendDomainServerCheckIn();
 }
 void Application::idle() {
 void Application::checkBandwidthMeterClick() {
     // ... to be called upon button release
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     if (Menu::getInstance()->isOptionChecked(MenuOption::Bandwidth) &&
         Menu::getInstance()->isOptionChecked(MenuOption::Stats) &&
         Menu::getInstance()->isOptionChecked(MenuOption::UserInterface) &&
 }
 void Application::setEnable3DTVMode(bool enable3DTVMode) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }
         _myCamera.setHmdRotation(glm::quat());
     }
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     resizeGL(glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }
 bool Application::mouseOnScreen() const {
     if (OculusManager::isConnected()) {
-        GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+        auto glCanvas = DependencyManager::get<GLCanvas>();
         return getMouseX() >= 0 && getMouseX() <= glCanvas->getDeviceWidth() &&
                getMouseY() >= 0 && getMouseY() <= glCanvas->getDeviceHeight();
     }
 }
 FaceTracker* Application::getActiveFaceTracker() {
-    Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
+    auto faceshift = DependencyManager::get<Faceshift>();
-    Visage::SharedPointer visage = DependencyManager::get<Visage>();
+    auto visage = DependencyManager::get<Visage>();
-    DdeFaceTracker::SharedPointer dde = DependencyManager::get<DdeFaceTracker>();
+    auto dde = DependencyManager::get<DdeFaceTracker>();
     return (dde->isActive() ? static_cast<FaceTracker*>(dde.data()) :
             (faceshift->isActive() ? static_cast<FaceTracker*>(faceshift.data()) :
     Leapmotion::init();
     // fire off an immediate domain-server check in now that settings are loaded
-    NodeList::getInstance()->sendDomainServerCheckIn();
+    DependencyManager::get<NodeList>()->sendDomainServerCheckIn();
     _entities.init();
     _entities.setViewFrustum(getViewFrustum());
     _metavoxels.init();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     _rearMirrorTools = new RearMirrorTools(glCanvas.data(), _mirrorViewRect, _settings);
     connect(_rearMirrorTools, SIGNAL(closeView()), SLOT(closeMirrorView()));
 void Application::updateFaceshift() {
     bool showWarnings = Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings);
     PerformanceWarning warn(showWarnings, "Application::updateFaceshift()");
-    Faceshift::SharedPointer faceshift = DependencyManager::get<Faceshift>();
+    auto faceshift = DependencyManager::get<Faceshift>();
     //  Update faceshift
     faceshift->update();
     char packet[MAX_PACKET_SIZE];
     // iterates thru all nodes in NodeList
-    NodeList* nodeList = NodeList::getInstance();
+    auto nodeList = DependencyManager::get<NodeList>();
     nodeList->eachNode([&](const SharedNodePointer& node){
     int inViewServers = 0;
     int unknownJurisdictionServers = 0;
-    NodeList* nodeList = NodeList::getInstance();
+    auto nodeList = DependencyManager::get<NodeList>();
     nodeList->eachNode([&](const SharedNodePointer& node) {
         // only send to the NodeTypes that are serverType
     fbo->release();
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     glViewport(0, 0, glCanvas->getDeviceWidth(), glCanvas->getDeviceHeight());
 }
 }
 glm::vec2 Application::getScaledScreenPoint(glm::vec2 projectedPoint) {
-    GLCanvas::SharedPointer glCanvas = DependencyManager::get<GLCanvas>();
+    auto glCanvas = DependencyManager::get<GLCanvas>();
     float horizontalScale = glCanvas->getDeviceWidth() / 2.0f;
     float verticalScale   = glCanvas->getDeviceHeight() / 2.0f;
 void Application::updateWindowTitle(){
     QString buildVersion = " (build " + applicationVersion() + ")";
-    NodeList* nodeList = NodeList::getInstance();
+    auto nodeList = DependencyManager::get<NodeList>();
     QString connectionStatus = nodeList->getDomainHandler().isConnected() ? "" : " (NOT CONNECTED) ";
     QString username = AccountManager::getInstance().getAccountInfo().getUsername();
 void Application::updateLocationInServer() {
     AccountManager& accountManager = AccountManager::getInstance();
-    DomainHandler& domainHandler = NodeList::getInstance()->getDomainHandler();
+    DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
     if (accountManager.isLoggedIn() && domainHandler.isConnected() && !domainHandler.getUUID().isNull()) {
 void Application::connectedToDomain(const QString& hostname) {
     AccountManager& accountManager = AccountManager::getInstance();
-    const QUuid& domainID = NodeList::getInstance()->getDomainHandler().getUUID();
+    const QUuid& domainID = DependencyManager::get<NodeList>()->getDomainHandler().getUUID();
     if (accountManager.isLoggedIn() && !domainID.isNull()) {
         // update our data-server with the domain-server we're logged in with
     // when the application is about to quit, stop our script engine so it unwinds properly
     connect(this, SIGNAL(aboutToQuit()), scriptEngine, SLOT(stop()));
-    NodeList* nodeList = NodeList::getInstance();
+    auto nodeList = DependencyManager::get<NodeList>();
-    connect(nodeList, &NodeList::nodeKilled, scriptEngine, &ScriptEngine::nodeKilled);
+    connect(nodeList.data(), &NodeList::nodeKilled, scriptEngine, &ScriptEngine::nodeKilled);
     scriptEngine->moveToThread(workerThread);

Merge branch 'master' into 20263

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code