History

Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539

John Conklin II committed 8 years ago

Commit 7ea46e22 parents de33ca5 cea2b947 files · +12 −0Browse files

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

Unified · Split

interface/src/Application.cpp+5−0
@@ -3220,6 +3220,7 @@ void Application::setSettingConstrainToolbarPosition(bool setting) { · 3219 unmodified lines
3220void Application::showHelp() {3220void Application::showHelp() {
3221 static const QString HAND_CONTROLLER_NAME_VIVE = "vive";3221 static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
3222 static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";3222 static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
3223 static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR";
3223 3224
3224 static const QString TAB_KEYBOARD_MOUSE = "kbm";3225 static const QString TAB_KEYBOARD_MOUSE = "kbm";
3225 static const QString TAB_GAMEPAD = "gamepad";3226 static const QString TAB_GAMEPAD = "gamepad";
@@ -3234,9 +3235,13 @@ void Application::showHelp() { · 8 unmodified lines
3234 } else if (PluginUtils::isOculusTouchControllerAvailable()) {3235 } else if (PluginUtils::isOculusTouchControllerAvailable()) {
3235 defaultTab = TAB_HAND_CONTROLLERS;3236 defaultTab = TAB_HAND_CONTROLLERS;
3236 handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;3237 handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
3238 } else if (qApp->getActiveDisplayPlugin()->getName() == "WindowMS") {
3239 defaultTab = TAB_HAND_CONTROLLERS;
3240 handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
3237 } else if (PluginUtils::isXboxControllerAvailable()) {3241 } else if (PluginUtils::isXboxControllerAvailable()) {
3238 defaultTab = TAB_GAMEPAD;3242 defaultTab = TAB_GAMEPAD;
3239 }3243 }
3244 // TODO need some way to detect windowsMR to load controls reference default tab in Help > Controls Reference menu.
3240 3245
3241 QUrlQuery queryString;3246 QUrlQuery queryString;
3242 queryString.addQueryItem("handControllerName", handControllerName);3247 queryString.addQueryItem("handControllerName", handControllerName);