Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 14:03:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

--no-launcher is the launcher override for interface. if app is launched with the args, the first run is bypassed and default display device will always be desktop. not hmd

Browse source
This commit is contained in:
amer cerkic 2019-07-09 11:39:42 -07:00
parent 45b339a6c7
commit 09ecb49e5b
1 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
interface/src/Application.cpp
View file

@ -5406,10 +5406,7 @@ void Application::loadSettings() {
}
bool isFirstPerson = false;
if (_firstRun.get()) {
// If this is our first run, and no preferred devices were set, default to
// an HMD device if available.
// Based on feedback changing to non hmd device as default if not prefered
if (arguments().contains("--no-launcher")) {
auto displayPlugins = pluginManager->getDisplayPlugins();
for (auto& plugin : displayPlugins) {
if (!plugin->isHmd()) {
@ -5420,18 +5417,35 @@ void Application::loadSettings() {
}
}
}
isFirstPerson = (qApp->isHMDMode());
}
else {
if (_firstRun.get()) {
// If this is our first run, and no preferred devices were set, default to
// an HMD device if available.
auto displayPlugins = pluginManager->getDisplayPlugins();
for (auto& plugin : displayPlugins) {
if (plugin->isHmd()) {
if (auto action = menu->getActionForOption(plugin->getName())) {
action->setChecked(true);
action->trigger();
break;
}
}
}
isFirstPerson = (qApp->isHMDMode());
}
else {
// if this is not the first run, the camera will be initialized differently depending on user settings
} else {
// if this is not the first run, the camera will be initialized differently depending on user settings
if (qApp->isHMDMode()) {
// if the HMD is active, use first-person camera, unless the appropriate setting is checked
isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonHMD);
} else {
// if HMD is not active, only use first person if the menu option is checked
isFirstPerson = menu->isOptionChecked(MenuOption::FirstPerson);
if (qApp->isHMDMode()) {
// if the HMD is active, use first-person camera, unless the appropriate setting is checked
isFirstPerson = menu->isOptionChecked(MenuOption::FirstPersonHMD);
}
else {
// if HMD is not active, only use first person if the menu option is checked
isFirstPerson = menu->isOptionChecked(MenuOption::FirstPerson);
}
}
}