Showing the changes to interface/src/Application.cpp (1 of 19 files). Show all
Unified · Split
| @@ -116,6 +116,7 @@ · 115 unmodified lines | ||
| 116 | 116 | #include "devices/RealSense.h" |
| 117 | 117 | #include "devices/SDL2Manager.h" |
| 118 | 118 | #include "devices/TV3DManager.h" |
| 119 | +#include "devices/3Dconnexion.h" | |
| 119 | 120 | |
| 120 | 121 | #include "scripting/AccountScriptingInterface.h" |
| 121 | 122 | #include "scripting/AudioDeviceScriptingInterface.h" |
| @@ -646,6 +647,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 524 unmodified lines | ||
| 646 | 647 | connect(applicationUpdater.data(), &AutoUpdater::newVersionIsAvailable, dialogsManager.data(), &DialogsManager::showUpdateDialog); |
| 647 | 648 | applicationUpdater->checkForUpdate(); |
| 648 | 649 | |
| 650 | + // the 3Dconnexion device wants to be initiliazed after a window is displayed. | |
| 651 | + ConnexionClient::init(); | |
| 652 | + | |
| 649 | 653 | auto& packetReceiver = nodeList->getPacketReceiver(); |
| 650 | 654 | packetReceiver.registerListener(PacketType::DomainConnectionDenied, this, "handleDomainConnectionDeniedPacket"); |
| 651 | 655 | } |
| @@ -760,6 +764,7 @@ Application::~Application() { · 108 unmodified lines | ||
| 760 | 764 | |
| 761 | 765 | Leapmotion::destroy(); |
| 762 | 766 | RealSense::destroy(); |
| 767 | + ConnexionClient::destroy(); | |
| 763 | 768 | |
| 764 | 769 | qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages |
| 765 | 770 | } |
| @@ -1490,6 +1495,7 @@ void Application::focusOutEvent(QFocusEvent* event) { · 724 unmodified lines | ||
| 1490 | 1495 | _keyboardMouseDevice.focusOutEvent(event); |
| 1491 | 1496 | SixenseManager::getInstance().focusOutEvent(); |
| 1492 | 1497 | SDL2Manager::getInstance()->focusOutEvent(); |
| 1498 | + ConnexionData::getInstance().focusOutEvent(); | |
| 1493 | 1499 | |
| 1494 | 1500 | // synthesize events for keys currently pressed, since we may not get their release events |
| 1495 | 1501 | foreach (int key, _keysPressed) { |
| @@ -3290,6 +3296,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 1794 unmodified lines | ||
| 3290 | 3296 | renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems(); |
| 3291 | 3297 | |
| 3292 | 3298 | renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus(); |
| 3299 | + renderContext._drawHitEffect = sceneInterface->doEngineDisplayHitEffect(); | |
| 3293 | 3300 | |
| 3294 | 3301 | renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion); |
| 3295 | 3302 | |