mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 21:36:47 +02:00
reverted a couple of testing changes and added a variable
This commit is contained in:
parent
b32a715496
commit
a79a75702a
2 changed files with 3 additions and 3 deletions
|
@ -978,7 +978,7 @@ Setting::Handle<int> sessionRunTime{ "sessionRunTime", 0 };
|
||||||
|
|
||||||
const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f;
|
const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f;
|
||||||
const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
|
const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f;
|
||||||
const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = false;
|
const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true;
|
||||||
const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
|
const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false;
|
||||||
const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
|
const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false;
|
||||||
const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
|
const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false;
|
||||||
|
@ -9301,7 +9301,6 @@ void Application::updateSystemTabletMode() {
|
||||||
if (isHMDMode()) {
|
if (isHMDMode()) {
|
||||||
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
|
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getHmdTabletBecomesToolbarSetting());
|
||||||
} else {
|
} else {
|
||||||
//_desktopTabletBecomesToolbarSetting.set(false);
|
|
||||||
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
|
DependencyManager::get<TabletScriptingInterface>()->setToolbarMode(getDesktopTabletBecomesToolbarSetting());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -457,6 +457,7 @@ function onGeometryChanged(rect) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700
|
||||||
function onDisplayModeChanged(isHMDMode) {
|
function onDisplayModeChanged(isHMDMode) {
|
||||||
if (isHMDMode) {
|
if (isHMDMode) {
|
||||||
Camera.setModeString("first person");
|
Camera.setModeString("first person");
|
||||||
|
@ -465,7 +466,7 @@ function onDisplayModeChanged(isHMDMode) {
|
||||||
Script.setTimeout(function () {
|
Script.setTimeout(function () {
|
||||||
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
|
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
|
||||||
toolbar.writeProperty("visible", false);
|
toolbar.writeProperty("visible", false);
|
||||||
}, 700);
|
}, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue