Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 15:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get logic working correctly.

Browse source
This commit is contained in:
r3tk0n 2018-11-13 15:20:46 -08:00
parent 597f83e6d5
commit ecee319602
2 changed files with 39 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,7 +144,7 @@
handControllerImageURL = "img/tablet-help-oculus.jpg"; handControllerImageURL = "img/tablet-help-oculus.jpg";
break; break;
default: default:
handControllerImageURL = null; handControllerImageURL = "";
count = 2; count = 2;
} }

46
interface/src/Application.cpp
View file

@ -3400,21 +3400,51 @@ 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 = ""; QString handControllerName;
QString defaultTab = TAB_KEYBOARD_MOUSE; QString defaultTab = TAB_KEYBOARD_MOUSE;
if (PluginUtils::isViveControllerAvailable()) { qDebug() << "Printing names...";
defaultTab = TAB_HAND_CONTROLLERS; for (auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
handControllerName = HAND_CONTROLLER_NAME_VIVE; qDebug() << inputPlugin->getName();
} else if (PluginUtils::isOculusTouchControllerAvailable()) { auto subdeviceNames = inputPlugin->getSubdeviceNames();
defaultTab = TAB_HAND_CONTROLLERS; for (auto& subdeviceName : subdeviceNames) {
handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH; qDebug() << " -|" << subdeviceName;
} else if (qApp->getActiveDisplayPlugin()->getName() == "WindowMS") { }
}
qDebug() << "----------------------";
auto displayPlugins = PluginManager::getInstance()->getDisplayPlugins();
for (auto& displayPlugin : displayPlugins) {
qDebug() << displayPlugin->getName();
}
if (PluginUtils::isHMDAvailable("WindowsMR")) {
defaultTab = TAB_HAND_CONTROLLERS; defaultTab = TAB_HAND_CONTROLLERS;
handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR; handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
//} else if (PluginUtils::isViveControllerAvailable()) {
} else if (PluginUtils::isHMDAvailable("HTC Vive")) {
defaultTab = TAB_HAND_CONTROLLERS;
handControllerName = HAND_CONTROLLER_NAME_VIVE;
} else if (PluginUtils::isHMDAvailable("Oculus Rift")) {
defaultTab = TAB_HAND_CONTROLLERS;
handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
} else if (PluginUtils::isXboxControllerAvailable()) { } else if (PluginUtils::isXboxControllerAvailable()) {
defaultTab = TAB_GAMEPAD; defaultTab = TAB_GAMEPAD;
} }
//if (QString::compare(qApp->getActiveDisplayPlugin()->getName(), "WindowsMR") == 0) {
// defaultTab = TAB_HAND_CONTROLLERS;
// handControllerName = HAND_CONTROLLER_NAME_WINDOWS_MR;
////} else if (PluginUtils::isViveControllerAvailable()) {
//} else if (QString::compare(qApp->getActiveDisplayPlugin()->getName(), "HTC Vive") == 0) {
// defaultTab = TAB_HAND_CONTROLLERS;
// handControllerName = HAND_CONTROLLER_NAME_VIVE;
//} else if (PluginUtils::isOculusTouchControllerAvailable()) {
// defaultTab = TAB_HAND_CONTROLLERS;
// handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH;
//} else if (PluginUtils::isXboxControllerAvailable()) {
// defaultTab = TAB_GAMEPAD;
//}
// TODO need some way to detect windowsMR to load controls reference default tab in Help > Controls Reference menu. // TODO need some way to detect windowsMR to load controls reference default tab in Help > Controls Reference menu.
QUrlQuery queryString; QUrlQuery queryString;