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

samcake committed 9 years ago

Commit bb389382 parents 3664655 e65895370 files · +1309 −332Browse files

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

Unified · Split

     Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
     auto nodeList = DependencyManager::get<NodeList>();
+    nodeList->startThread();
     // Set up a watchdog thread to intentionally crash the application on deadlocks
     _deadlockWatchdogThread = new DeadlockWatchdogThread();
     updateHeartbeat();
-    // start the nodeThread so its event loop is running
-    QThread* nodeThread = new QThread(this);
-    nodeThread->setObjectName("NodeList Thread");
-    nodeThread->start();
-    // make sure the node thread is given highest priority
-    nodeThread->setPriority(QThread::TimeCriticalPriority);
     // setup a timer for domain-server check ins
     QTimer* domainCheckInTimer = new QTimer(nodeList.data());
     connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
     domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
-    // put the NodeList and datagram processing on the node thread
-    nodeList->moveToThread(nodeThread);
-    // put the audio processing on a separate thread
-    QThread* audioThread = new QThread();
-    audioThread->setObjectName("Audio Thread");
     auto audioIO = DependencyManager::get<AudioClient>();
     audioIO->setPositionGetter([]{
         return myAvatar ? myAvatar->getOrientationForAudio() : Quaternions::IDENTITY;
     });
-    audioIO->moveToThread(audioThread);
     recording::Frame::registerFrameHandler(AudioConstants::getAudioFrameName(), [=](recording::Frame::ConstPointer frame) {
         audioIO->handleRecordedAudioInput(frame->data);
     });
     });
     auto audioScriptingInterface = DependencyManager::set<AudioScriptingInterface>();
-    connect(audioThread, &QThread::started, audioIO.data(), &AudioClient::start);
-    connect(audioIO.data(), &AudioClient::destroyed, audioThread, &QThread::quit);
-    connect(audioThread, &QThread::finished, audioThread, &QThread::deleteLater);
     connect(audioIO.data(), &AudioClient::muteToggled, this, &Application::audioMuteToggled);
     connect(audioIO.data(), &AudioClient::mutedByMixer, audioScriptingInterface.data(), &AudioScriptingInterface::mutedByMixer);
     connect(audioIO.data(), &AudioClient::receivedFirstPacket, audioScriptingInterface.data(), &AudioScriptingInterface::receivedFirstPacket);
         }
     });
-    audioThread->start();
+    audioIO->startThread();
     ResourceManager::init();
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
     // Setup MessagesClient
-    auto messagesClient = DependencyManager::get<MessagesClient>();
+    DependencyManager::get<MessagesClient>()->startThread();
-    QThread* messagesThread = new QThread;
-    messagesThread->setObjectName("Messages Client Thread");
-    messagesClient->moveToThread(messagesThread);
-    connect(messagesThread, &QThread::started, messagesClient.data(), &MessagesClient::init);
-    messagesThread->start();
     const DomainHandler& domainHandler = nodeList->getDomainHandler();
         _autoSwitchDisplayModeSupportedHMDPlugin->endSession();
     }
     // use the CloseEventSender via a QThread to send an event that says the user asked for the app to close
-    auto closeEventSender = DependencyManager::get<CloseEventSender>();
+    DependencyManager::get<CloseEventSender>()->startThread();
-    QThread* closureEventThread = new QThread(this);
-    closeEventSender->moveToThread(closureEventThread);
-    // sendQuitEventAsync will bail immediately if the UserActivityLogger is not enabled
-    connect(closureEventThread, &QThread::started, closeEventSender.data(), &CloseEventSender::sendQuitEventAsync);
-    closureEventThread->start();
     // Hide Running Scripts dialog so that it gets destroyed in an orderly manner; prevents warnings at shutdown.
     DependencyManager::get<OffscreenUi>()->hide("RunningScripts");
     // stop QML
     DependencyManager::destroy<OffscreenUi>();
+    DependencyManager::destroy<OffscreenQmlSurfaceCache>();
     if (_snapshotSoundInjector != nullptr) {
         _snapshotSoundInjector->stop();
     }
     ResourceManager::cleanup();
-    QThread* nodeThread = DependencyManager::get<NodeList>()->thread();
     // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
-    // ask the node thread to quit and wait until it is done
-    nodeThread->quit();
-    nodeThread->wait();
     Leapmotion::destroy();
     if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
             }
         } else {
             //  I am not looking at anyone else, so just look forward
-            if (isHMD) {
+            auto headPose = myAvatar->getHeadControllerPoseInSensorFrame();
-                glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() *
+            if (headPose.isValid()) {
-                    myAvatar->getHeadControllerPoseInSensorFrame().getMatrix();
+                glm::mat4 worldHeadMat = myAvatar->getSensorToWorldMatrix() * headPose.getMatrix();
-                lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, -TREE_SCALE));
+                lookAtSpot = transformPoint(worldHeadMat, glm::vec3(0.0f, 0.0f, TREE_SCALE));
             } else {
                 lookAtSpot = myAvatar->getHead()->getEyePosition() +
                     (myAvatar->getHead()->getFinalOrientationInWorldFrame() * glm::vec3(0.0f, 0.0f, -TREE_SCALE));