mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 23:57:13 +02:00
WIP.
This commit is contained in:
parent
d01d774f76
commit
c1bc3bd154
3 changed files with 2 additions and 20 deletions
|
@ -3180,11 +3180,6 @@ void Application::setHmdTabletBecomesToolbarSetting(bool value) {
|
||||||
updateSystemTabletMode();
|
updateSystemTabletMode();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::setShowOverlays(bool value) {
|
|
||||||
_hmdTabletBecomesToolbarSetting.set(value);
|
|
||||||
updateSystemTabletMode();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Application::setPreferStylusOverLaser(bool value) {
|
void Application::setPreferStylusOverLaser(bool value) {
|
||||||
_preferStylusOverLaserSetting.set(value);
|
_preferStylusOverLaserSetting.set(value);
|
||||||
}
|
}
|
||||||
|
@ -5130,11 +5125,6 @@ void Application::toggleOverlays() {
|
||||||
menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
|
menu->setIsOptionChecked(MenuOption::Overlays, !menu->isOptionChecked(MenuOption::Overlays));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Application::setOverlaysVisible(bool visible) {
|
|
||||||
auto menu = Menu::getInstance();
|
|
||||||
menu->setIsOptionChecked(MenuOption::Overlays, visible);
|
|
||||||
}
|
|
||||||
|
|
||||||
void Application::centerUI() {
|
void Application::centerUI() {
|
||||||
_overlayConductor.centerUI();
|
_overlayConductor.centerUI();
|
||||||
}
|
}
|
||||||
|
@ -8274,8 +8264,7 @@ void Application::updateSystemTabletMode() {
|
||||||
if (isHMDMode()) {
|
if (isHMDMode()) {
|
||||||
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
|
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
|
||||||
} else {
|
} else {
|
||||||
// Show toolbar if toolbar is enabled AND the Show Overlays menu option is checked
|
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
|
||||||
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting() && (Menu::getInstance()->isOptionChecked(MenuOption::Overlays)));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,12 +218,8 @@ public:
|
||||||
|
|
||||||
bool getDesktopTabletBecomesToolbarSetting() { return _desktopTabletBecomesToolbarSetting.get(); }
|
bool getDesktopTabletBecomesToolbarSetting() { return _desktopTabletBecomesToolbarSetting.get(); }
|
||||||
void setDesktopTabletBecomesToolbarSetting(bool value);
|
void setDesktopTabletBecomesToolbarSetting(bool value);
|
||||||
|
|
||||||
bool getHmdTabletBecomesToolbarSetting() { return _hmdTabletBecomesToolbarSetting.get(); }
|
bool getHmdTabletBecomesToolbarSetting() { return _hmdTabletBecomesToolbarSetting.get(); }
|
||||||
void setHmdTabletBecomesToolbarSetting(bool value);
|
void setHmdTabletBecomesToolbarSetting(bool value);
|
||||||
|
|
||||||
void setShowOverlays(bool value);
|
|
||||||
|
|
||||||
bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
|
bool getPreferStylusOverLaser() { return _preferStylusOverLaserSetting.get(); }
|
||||||
void setPreferStylusOverLaser(bool value);
|
void setPreferStylusOverLaser(bool value);
|
||||||
// FIXME: Remove setting completely or make available through JavaScript API?
|
// FIXME: Remove setting completely or make available through JavaScript API?
|
||||||
|
|
|
@ -240,10 +240,7 @@ Menu::Menu() {
|
||||||
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::CenterPlayerInView,
|
||||||
0, true, qApp, SLOT(rotationModeChanged()));
|
0, true, qApp, SLOT(rotationModeChanged()));
|
||||||
|
|
||||||
action = addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Overlays, 0, true);
|
||||||
connect(action, &QAction::triggered, [action] {
|
|
||||||
qApp->setDesktopTabletBecomesToolbarSetting(action->isChecked());
|
|
||||||
});
|
|
||||||
|
|
||||||
// View > Enter First Person Mode in HMD
|
// View > Enter First Person Mode in HMD
|
||||||
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);
|
addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPersonHMD, 0, true);
|
||||||
|
|
Loading…
Reference in a new issue