Moving windows to SDK 0.6

Working on SDK 0.6 for windows Working on SDK 0.6 for windows

Brad Davis committed 11 years ago

Commit f6142681 parent a63811a10 files · +840 −392Browse files

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

Unified · Split

             // attempt to reconnect the Oculus manager - it's possible this was a workaround
             // for the sixense crash
             OculusManager::disconnect();
+            _glWidget->makeCurrent();
             OculusManager::connect();
         }
         OculusManager::recalibrate();
     } else {
         OculusManager::abandonCalibration();
+        OculusManager::disconnect();
         _mirrorCamera.setHmdPosition(glm::vec3());
         _mirrorCamera.setHmdRotation(glm::quat());
     _mirrorCamera.setMode(CAMERA_MODE_MIRROR);
-    OculusManager::connect();
+    //OculusManager::connect();
-    if (OculusManager::isConnected()) {
+    //if (OculusManager::isConnected()) {
-        QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen),
+    //    QMetaObject::invokeMethod(Menu::getInstance()->getActionForOption(MenuOption::Fullscreen),
-                                  "trigger",
+    //                              "trigger",
-                                  Qt::QueuedConnection);
+    //                              Qt::QueuedConnection);
-    }
+    //}
     TV3DManager::connect();
     if (TV3DManager::isConnected()) {

Keyboard shortcuts