Working on SDK 0.6 for windows Working on SDK 0.6 for windows
Showing the changes to interface/src/Application.cpp (1 of 10 files). Show all
Unified · Split
| @@ -1860,11 +1860,13 @@ void Application::setEnableVRMode(bool enableVRMode) { · 1859 unmodified lines | ||
| 1860 | 1860 | // attempt to reconnect the Oculus manager - it's possible this was a workaround |
| 1861 | 1861 | // for the sixense crash |
| 1862 | 1862 | OculusManager::disconnect(); |
| 1863 | + _glWidget->makeCurrent(); | |
| 1863 | 1864 | OculusManager::connect(); |
| 1864 | 1865 | } |
| 1865 | 1866 | OculusManager::recalibrate(); |
| 1866 | 1867 | } else { |
| 1867 | 1868 | OculusManager::abandonCalibration(); |
| 1869 | + OculusManager::disconnect(); | |
| 1868 | 1870 | |
| 1869 | 1871 | _mirrorCamera.setHmdPosition(glm::vec3()); |
| 1870 | 1872 | _mirrorCamera.setHmdRotation(glm::quat()); |
| @@ -2102,12 +2104,12 @@ void Application::init() { · 231 unmodified lines | ||
| 2102 | 2104 | |
| 2103 | 2105 | _mirrorCamera.setMode(CAMERA_MODE_MIRROR); |
| 2104 | 2106 | |
| 2105 | − OculusManager::connect(); | |
| 2106 | − if (OculusManager::isConnected()) { | |
| 2107 | − QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen), | |
| 2108 | − "trigger", | |
| 2109 | − Qt::QueuedConnection); | |
| 2110 | − } | |
| 2107 | + //OculusManager::connect(); | |
| 2108 | + //if (OculusManager::isConnected()) { | |
| 2109 | + // QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen), | |
| 2110 | + // "trigger", | |
| 2111 | + // Qt::QueuedConnection); | |
| 2112 | + //} | |
| 2111 | 2113 | |
| 2112 | 2114 | TV3DManager::connect(); |
| 2113 | 2115 | if (TV3DManager::isConnected()) { |