History

Add support for oculus touch in help menu

Ryan Huffman committed 9 years ago

Commit 9f166d81 parent 06b73885 files · +83 −17Browse files

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

Unified · Split

interface/src/Application.cpp+20−6
@@ -2180,17 +2180,31 @@ void Application::aboutApp() { · 2179 unmodified lines
2180}2180}
2181 2181
2182void Application::showHelp() {2182void Application::showHelp() {
2183 static const QString QUERY_STRING_XBOX = "xbox";2183 static const QString HAND_CONTROLLER_NAME_VIVE = "vive";
2184 static const QString QUERY_STRING_VIVE = "vive";2184 static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
2185
2186 static const QString TAB_KEYBOARD_MOUSE = "kbm";
2187 static const QString TAB_GAMEPAD = "gamepad";
2188 static const QString TAB_HAND_CONTROLLERS = "handControllers";
2189
2190 QString handControllerName = HAND_CONTROLLER_NAME_VIVE;
2191 QString defaultTab = TAB_KEYBOARD_MOUSE;
2185 2192
2186 QString queryString = "";
2187 if (PluginUtils::isViveControllerAvailable()) {2193 if (PluginUtils::isViveControllerAvailable()) {
2188 queryString = QUERY_STRING_VIVE;2194 defaultTab = TAB_HAND_CONTROLLERS;
2195 handControllerName = HAND_CONTROLLER_NAME_VIVE;
2196 } else if (PluginUtils::isOculusTouchControllerAvailable()) {
2197 defaultTab = TAB_HAND_CONTROLLERS;
2198 handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
2189 } else if (PluginUtils::isXboxControllerAvailable()) {2199 } else if (PluginUtils::isXboxControllerAvailable()) {
2190 queryString = QUERY_STRING_XBOX;2200 defaultTab = TAB_GAMEPAD;
2191 }2201 }
2192 2202
2193 InfoView::show(INFO_HELP_PATH, false, queryString);2203 QUrlQuery queryString;
2204 queryString.addQueryItem("handControllerName", handControllerName);
2205 queryString.addQueryItem("defaultTab", defaultTab);
2206
2207 InfoView::show(INFO_HELP_PATH, false, queryString.toString());
2194}2208}
2195 2209
2196void Application::resizeEvent(QResizeEvent* event) {2210void Application::resizeEvent(QResizeEvent* event) {