Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 06:38:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix desktop case showing Vive controls.

Browse source
This commit is contained in:
r3tk0n 2018-11-08 16:50:11 -08:00
parent 84209c0e53
commit d2a1b35f96
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
interface/resources/html/tabletHelp.html
View file

@ -94,15 +94,14 @@
switch (index) switch (index)
{ {
case 0: case 0:
showHandControllers();
break;
case 1:
showGamepad(); showGamepad();
break; break;
case 2: case 1:
showKbm(); showKbm();
break; break;
case 2:
showHandControllers();
break;
default: default:
} }
} }
@ -142,23 +141,26 @@
handControllerImageURL = "img/tablet-help-vive.jpg"; handControllerImageURL = "img/tablet-help-vive.jpg";
break; break;
case "oculus": case "oculus":
default:
handControllerImageURL = "img/tablet-help-oculus.jpg"; handControllerImageURL = "img/tablet-help-oculus.jpg";
break;
default:
handControllerImageURL = null;
count = 2;
} }
switch (params.defaultTab) { switch (params.defaultTab) {
case "handControllers": case "handControllers":
showHandControllers(); showHandControllers();
index = 0; index = 2;
break; break;
case "gamepad": case "gamepad":
showGamepad(); showGamepad();
index = 1; index = 0;
break; break;
case "kbm": case "kbm":
default: default:
showKbm(); showKbm();
index = 2; index = 1;
} }
} }
</script> </script>

2
interface/src/Application.cpp
View file

@ -3366,7 +3366,7 @@ void Application::showHelp() {
static const QString TAB_GAMEPAD = "gamepad"; static const QString TAB_GAMEPAD = "gamepad";
static const QString TAB_HAND_CONTROLLERS = "handControllers"; static const QString TAB_HAND_CONTROLLERS = "handControllers";
QString handControllerName = HAND_CONTROLLER_NAME_VIVE; QString handControllerName = "";
QString defaultTab = TAB_KEYBOARD_MOUSE; QString defaultTab = TAB_KEYBOARD_MOUSE;
if (PluginUtils::isViveControllerAvailable()) { if (PluginUtils::isViveControllerAvailable()) {