Showing the changes to interface/src/Application.cpp (1 of 38 files). Show all
Unified · Split
| @@ -115,6 +115,7 @@ · 114 unmodified lines | ||
| 115 | 115 | #include "devices/MIDIManager.h" |
| 116 | 116 | #include "devices/OculusManager.h" |
| 117 | 117 | #include "devices/TV3DManager.h" |
| 118 | +#include "devices/3Dconnexion.h" | |
| 118 | 119 | |
| 119 | 120 | #include "scripting/AccountScriptingInterface.h" |
| 120 | 121 | #include "scripting/AudioDeviceScriptingInterface.h" |
| @@ -639,6 +640,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 518 unmodified lines | ||
| 639 | 640 | connect(applicationUpdater.data(), &AutoUpdater::newVersionIsAvailable, dialogsManager.data(), &DialogsManager::showUpdateDialog); |
| 640 | 641 | applicationUpdater->checkForUpdate(); |
| 641 | 642 | |
| 643 | + // the 3Dconnexion device wants to be initiliazed after a window is displayed. | |
| 644 | + ConnexionClient::init(); | |
| 645 | + | |
| 642 | 646 | auto& packetReceiver = nodeList->getPacketReceiver(); |
| 643 | 647 | packetReceiver.registerListener(PacketType::DomainConnectionDenied, this, "handleDomainConnectionDeniedPacket"); |
| 644 | 648 | } |
| @@ -750,6 +754,7 @@ Application::~Application() { · 105 unmodified lines | ||
| 750 | 754 | |
| 751 | 755 | Leapmotion::destroy(); |
| 752 | 756 | RealSense::destroy(); |
| 757 | + ConnexionClient::destroy(); | |
| 753 | 758 | |
| 754 | 759 | qInstallMessageHandler(NULL); // NOTE: Do this as late as possible so we continue to get our log messages |
| 755 | 760 | } |
| @@ -1488,6 +1493,7 @@ void Application::focusOutEvent(QFocusEvent* event) { · 732 unmodified lines | ||
| 1488 | 1493 | _keyboardMouseDevice.focusOutEvent(event); |
| 1489 | 1494 | SixenseManager::getInstance().focusOutEvent(); |
| 1490 | 1495 | SDL2Manager::getInstance()->focusOutEvent(); |
| 1496 | + ConnexionData::getInstance().focusOutEvent(); | |
| 1491 | 1497 | |
| 1492 | 1498 | // synthesize events for keys currently pressed, since we may not get their release events |
| 1493 | 1499 | foreach (int key, _keysPressed) { |
| @@ -3272,6 +3278,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se · 1778 unmodified lines | ||
| 3272 | 3278 | renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems(); |
| 3273 | 3279 | |
| 3274 | 3280 | renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus(); |
| 3281 | + renderContext._drawHitEffect = sceneInterface->doEngineDisplayHitEffect(); | |
| 3275 | 3282 | |
| 3276 | 3283 | renderContext._occlusionStatus = Menu::getInstance()->isOptionChecked(MenuOption::DebugAmbientOcclusion); |
| 3277 | 3284 | |
| @@ -3389,7 +3396,7 @@ void Application::renderRearViewMirror(RenderArgs* renderArgs, const QRect& regi · 111 unmodified lines | ||
| 3389 | 3396 | // This was removed in commit 71e59cfa88c6563749594e25494102fe01db38e9 but could be further |
| 3390 | 3397 | // investigated in order to adapt the technique while fixing the head rendering issue, |
| 3391 | 3398 | // but the complexity of the hack suggests that a better approach |
| 3392 | − _mirrorCamera.setPosition(_myAvatar->getHead()->getEyePosition() + | |
| 3399 | + _mirrorCamera.setPosition(_myAvatar->getDefaultEyePosition() + | |
| 3393 | 3400 | _myAvatar->getOrientation() * glm::vec3(0.0f, 0.0f, -1.0f) * MIRROR_REARVIEW_DISTANCE * _myAvatar->getScale()); |
| 3394 | 3401 | } |
| 3395 | 3402 | _mirrorCamera.setProjection(glm::perspective(glm::radians(fov), aspect, DEFAULT_NEAR_CLIP, DEFAULT_FAR_CLIP)); |