Showing the changes to interface/src/Application.cpp (1 of 181 files). Show all
Unified · Split
| @@ -660,7 +660,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 659 unmodified lines | |||
| 660 | _myAvatar->updateStandingHMDModeFromMenu(); | 660 | _myAvatar->updateStandingHMDModeFromMenu(); |
| 661 | 661 | ||
| 662 | // the 3Dconnexion device wants to be initiliazed after a window is displayed. | 662 | // the 3Dconnexion device wants to be initiliazed after a window is displayed. |
| 663 | ConnexionClient::init(); | 663 | ConnexionClient::getInstance().init(); |
| 664 | 664 | ||
| 665 | auto& packetReceiver = nodeList->getPacketReceiver(); | 665 | auto& packetReceiver = nodeList->getPacketReceiver(); |
| 666 | packetReceiver.registerListener(PacketType::DomainConnectionDenied, this, "handleDomainConnectionDeniedPacket"); | 666 | packetReceiver.registerListener(PacketType::DomainConnectionDenied, this, "handleDomainConnectionDeniedPacket"); |
| @@ -779,7 +779,7 @@ Application::~Application() { · 112 unmodified lines | |||
| 779 | 779 | ||
| 780 | Leapmotion::destroy(); | 780 | Leapmotion::destroy(); |
| 781 | RealSense::destroy(); | 781 | RealSense::destroy(); |
| 782 | ConnexionClient::destroy(); | 782 | ConnexionClient::getInstance().destroy(); |
| 783 | 783 | ||
| 784 | qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages | 784 | qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages |
| 785 | } | 785 | } |
| @@ -936,14 +936,15 @@ void Application::paintGL() { · 150 unmodified lines | |||
| 936 | 936 | ||
| 937 | { | 937 | { |
| 938 | float ratio = ((float)QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale()); | 938 | float ratio = ((float)QApplication::desktop()->windowHandle()->devicePixelRatio() * getRenderResolutionScale()); |
| 939 | auto mirrorViewport = glm::ivec4(0, 0, _mirrorViewRect.width() * ratio, _mirrorViewRect.height() * ratio); | 939 | // Flip the src and destination rect horizontally to do the mirror |
| 940 | auto mirrorViewportDest = mirrorViewport; | 940 | auto mirrorRect = glm::ivec4(0, 0, _mirrorViewRect.width() * ratio, _mirrorViewRect.height() * ratio); |
| 941 | auto mirrorRectDest = glm::ivec4(mirrorRect.z, mirrorRect.y, mirrorRect.x, mirrorRect.w); | ||
| 941 | 942 | ||
| 942 | auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer(); | 943 | auto selfieFbo = DependencyManager::get<FramebufferCache>()->getSelfieFramebuffer(); |
| 943 | gpu::Batch batch; | 944 | gpu::Batch batch; |
| 944 | batch.setFramebuffer(selfieFbo); | 945 | batch.setFramebuffer(selfieFbo); |
| 945 | batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f)); | 946 | batch.clearColorFramebuffer(gpu::Framebuffer::BUFFER_COLOR0, glm::vec4(0.0f, 0.0f, 0.0f, 0.0f)); |
| 946 | batch.blit(primaryFbo, mirrorViewport, selfieFbo, mirrorViewportDest); | 947 | batch.blit(primaryFbo, mirrorRect, selfieFbo, mirrorRectDest); |
| 947 | batch.setFramebuffer(nullptr); | 948 | batch.setFramebuffer(nullptr); |
| 948 | renderArgs._context->render(batch); | 949 | renderArgs._context->render(batch); |
| 949 | } | 950 | } |
| @@ -2047,6 +2048,7 @@ void Application::setActiveFaceTracker() { · 1097 unmodified lines | |||
| 2047 | #ifdef HAVE_DDE | 2048 | #ifdef HAVE_DDE |
| 2048 | bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera); | 2049 | bool isUsingDDE = Menu::getInstance()->isOptionChecked(MenuOption::UseCamera); |
| 2049 | Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE); | 2050 | Menu::getInstance()->getActionForOption(MenuOption::BinaryEyelidControl)->setVisible(isUsingDDE); |
| 2051 | Menu::getInstance()->getActionForOption(MenuOption::CoupleEyelids)->setVisible(isUsingDDE); | ||
| 2050 | Menu::getInstance()->getActionForOption(MenuOption::UseAudioForMouth)->setVisible(isUsingDDE); | 2052 | Menu::getInstance()->getActionForOption(MenuOption::UseAudioForMouth)->setVisible(isUsingDDE); |
| 2051 | Menu::getInstance()->getActionForOption(MenuOption::VelocityFilter)->setVisible(isUsingDDE); | 2053 | Menu::getInstance()->getActionForOption(MenuOption::VelocityFilter)->setVisible(isUsingDDE); |
| 2052 | Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setVisible(isUsingDDE); | 2054 | Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setVisible(isUsingDDE); |
| @@ -3762,10 +3764,13 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 1709 unmodified lines | |||
| 3762 | scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); | 3764 | scriptEngine->registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data()); |
| 3763 | scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data()); | 3765 | scriptEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data()); |
| 3764 | scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance()); | 3766 | scriptEngine->registerGlobalObject("Account", AccountScriptingInterface::getInstance()); |
| 3767 | scriptEngine->registerGlobalObject("DialogsManager", _dialogsManagerScriptingInterface); | ||
| 3765 | 3768 | ||
| 3766 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); | 3769 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); |
| 3767 | qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); | 3770 | qScriptRegisterMetaType(scriptEngine, DownloadInfoResultToScriptValue, DownloadInfoResultFromScriptValue); |
| 3768 | 3771 | ||
| 3772 | scriptEngine->registerGlobalObject("FaceTracker", DependencyManager::get<DdeFaceTracker>().data()); | ||
| 3773 | |||
| 3769 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); | 3774 | scriptEngine->registerGlobalObject("AvatarManager", DependencyManager::get<AvatarManager>().data()); |
| 3770 | 3775 | ||
| 3771 | qScriptRegisterMetaType(scriptEngine, joystickToScriptValue, joystickFromScriptValue); | 3776 | qScriptRegisterMetaType(scriptEngine, joystickToScriptValue, joystickFromScriptValue); |