Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-15 08:26:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Clean up code and remove comments.

Browse source
This commit is contained in:
r3tk0n 2018-11-13 15:36:25 -08:00
parent ecee319602
commit dd8bbeb0e5
1 changed files with 7 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
interface/src/Application.cpp
View file

@ -3396,6 +3396,10 @@ void Application::showHelp() {
static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus"; static const QString HAND_CONTROLLER_NAME_OCULUS_TOUCH = "oculus";
static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR"; static const QString HAND_CONTROLLER_NAME_WINDOWS_MR = "windowsMR";
static const QString VIVE_PLUGIN_NAME = "HTC Vive";
static const QString OCULUS_RIFT_PLUGIN_NAME = "Oculus Rift";
static const QString WINDOWS_MR_PLUGIN_NAME = "WindowsMR";
static const QString TAB_KEYBOARD_MOUSE = "kbm"; static const QString TAB_KEYBOARD_MOUSE = "kbm";
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";
@ -3403,49 +3407,18 @@ void Application::showHelp() {
QString handControllerName; QString handControllerName;
QString defaultTab = TAB_KEYBOARD_MOUSE; QString defaultTab = TAB_KEYBOARD_MOUSE;
qDebug() << "Printing names..."; if (PluginUtils::isHMDAvailable(WINDOWS_MR_PLUGIN_NAME)) {
for (auto& inputPlugin : PluginManager::getInstance()->getInputPlugins()) {
qDebug() << inputPlugin->getName();
auto subdeviceNames = inputPlugin->getSubdeviceNames();
for (auto& subdeviceName : subdeviceNames) {
qDebug() << " -|" << subdeviceName;
}
}
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(VIVE_PLUGIN_NAME)) {
} else if (PluginUtils::isHMDAvailable("HTC Vive")) {
defaultTab = TAB_HAND_CONTROLLERS; defaultTab = TAB_HAND_CONTROLLERS;
handControllerName = HAND_CONTROLLER_NAME_VIVE; handControllerName = HAND_CONTROLLER_NAME_VIVE;
} else if (PluginUtils::isHMDAvailable("Oculus Rift")) { } else if (PluginUtils::isHMDAvailable(OCULUS_RIFT_PLUGIN_NAME)) {
defaultTab = TAB_HAND_CONTROLLERS; defaultTab = TAB_HAND_CONTROLLERS;
handControllerName = HAND_CONTROLLER_NAME_OCULUS_TOUCH; 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.
QUrlQuery queryString; QUrlQuery queryString;
queryString.addQueryItem("handControllerName", handControllerName); queryString.addQueryItem("handControllerName", handControllerName);