From b32a71549675e089e0630c6407dce9ebddfe6657 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Tue, 11 Jun 2019 16:29:32 -0700 Subject: [PATCH 1/5] fixed persistant ui element when switching from HMD to Desktop. not a complete fix but sufficient for M1 --- diff.patch | 40 +++++++++++++++++++++++++ interface/src/Application.cpp | 3 +- scripts/simplifiedUI/ui/simplifiedUI.js | 12 ++++++-- 3 files changed, 51 insertions(+), 4 deletions(-) create mode 100644 diff.patch diff --git a/diff.patch b/diff.patch new file mode 100644 index 0000000000..4f433568b9 --- /dev/null +++ b/diff.patch @@ -0,0 +1,40 @@ +diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js +index cdf6a9591a..4116eb4314 100644 +--- a/scripts/simplifiedUI/ui/simplifiedUI.js ++++ b/scripts/simplifiedUI/ui/simplifiedUI.js +@@ -457,9 +457,16 @@ function onGeometryChanged(rect) { + } + } + +-function ensureFirstPersonCameraInHMD(isHMDMode) { ++function onDisplayModeChanged(isHMDMode) { ++ print("TEST 2"); + if (isHMDMode) { + Camera.setModeString("first person"); ++ } else { ++ //setTimeout(function () { ++ toolbar.writeProperty("visible", false); ++ print("TEST"); ++ //}, 10000); ++ + } + } + +@@ -505,7 +512,7 @@ function startup() { + updateOutputDeviceMutedOverlay(isOutputMuted()); + Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); + Window.geometryChanged.connect(onGeometryChanged); +- HMD.displayModeChanged.connect(ensureFirstPersonCameraInHMD); ++ HMD.displayModeChanged.connect(onDisplayModeChanged); + Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); + Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); + Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); +@@ -559,7 +566,7 @@ function shutdown() { + + Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); + Window.geometryChanged.disconnect(onGeometryChanged); +- HMD.displayModeChanged.disconnect(ensureFirstPersonCameraInHMD); ++ HMD.displayModeChanged.disconnect(onDisplayModeChanged); + Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); + Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); + Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6d8e2a31af..547b8d387b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -978,7 +978,7 @@ Setting::Handle sessionRunTime{ "sessionRunTime", 0 }; const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.0f; const float DEFAULT_DESKTOP_TABLET_SCALE_PERCENT = 75.0f; -const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = true; +const bool DEFAULT_DESKTOP_TABLET_BECOMES_TOOLBAR = false; const bool DEFAULT_HMD_TABLET_BECOMES_TOOLBAR = false; const bool DEFAULT_PREFER_STYLUS_OVER_LASER = false; const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; @@ -9301,6 +9301,7 @@ void Application::updateSystemTabletMode() { if (isHMDMode()) { DependencyManager::get()->setToolbarMode(getHmdTabletBecomesToolbarSetting()); } else { + //_desktopTabletBecomesToolbarSetting.set(false); DependencyManager::get()->setToolbarMode(getDesktopTabletBecomesToolbarSetting()); } } diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index cdf6a9591a..7547f04fa2 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -457,9 +457,15 @@ function onGeometryChanged(rect) { } } -function ensureFirstPersonCameraInHMD(isHMDMode) { +function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person"); + } else { + //works for now, but not a permanent fix by any means. + Script.setTimeout(function () { + var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); + toolbar.writeProperty("visible", false); + }, 700); } } @@ -505,7 +511,7 @@ function startup() { updateOutputDeviceMutedOverlay(isOutputMuted()); Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); Window.geometryChanged.connect(onGeometryChanged); - HMD.displayModeChanged.connect(ensureFirstPersonCameraInHMD); + HMD.displayModeChanged.connect(onDisplayModeChanged); Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); @@ -559,7 +565,7 @@ function shutdown() { Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); Window.geometryChanged.disconnect(onGeometryChanged); - HMD.displayModeChanged.disconnect(ensureFirstPersonCameraInHMD); + HMD.displayModeChanged.disconnect(onDisplayModeChanged); Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); From 6622aba4ac40a56129b973279a07c82e8367d9f5 Mon Sep 17 00:00:00 2001 From: PrestonB1123 <51343779+PrestonB1123@users.noreply.github.com> Date: Wed, 12 Jun 2019 09:13:20 -0700 Subject: [PATCH 2/5] Delete diff.patch --- diff.patch | 40 ---------------------------------------- 1 file changed, 40 deletions(-) delete mode 100644 diff.patch diff --git a/diff.patch b/diff.patch deleted file mode 100644 index 4f433568b9..0000000000 --- a/diff.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js -index cdf6a9591a..4116eb4314 100644 ---- a/scripts/simplifiedUI/ui/simplifiedUI.js -+++ b/scripts/simplifiedUI/ui/simplifiedUI.js -@@ -457,9 +457,16 @@ function onGeometryChanged(rect) { - } - } - --function ensureFirstPersonCameraInHMD(isHMDMode) { -+function onDisplayModeChanged(isHMDMode) { -+ print("TEST 2"); - if (isHMDMode) { - Camera.setModeString("first person"); -+ } else { -+ //setTimeout(function () { -+ toolbar.writeProperty("visible", false); -+ print("TEST"); -+ //}, 10000); -+ - } - } - -@@ -505,7 +512,7 @@ function startup() { - updateOutputDeviceMutedOverlay(isOutputMuted()); - Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); - Window.geometryChanged.connect(onGeometryChanged); -- HMD.displayModeChanged.connect(ensureFirstPersonCameraInHMD); -+ HMD.displayModeChanged.connect(onDisplayModeChanged); - Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); - Audio.localInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); - Audio.serverInjectorGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); -@@ -559,7 +566,7 @@ function shutdown() { - - Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); - Window.geometryChanged.disconnect(onGeometryChanged); -- HMD.displayModeChanged.disconnect(ensureFirstPersonCameraInHMD); -+ HMD.displayModeChanged.disconnect(onDisplayModeChanged); - Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); - Audio.localInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); - Audio.serverInjectorGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); From a79a75702a7f7437baa7e77f0085594e3ae16880 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 09:17:18 -0700 Subject: [PATCH 3/5] reverted a couple of testing changes and added a variable --- interface/src/Application.cpp | 3 +-- scripts/simplifiedUI/ui/simplifiedUI.js | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 547b8d387b..6d8e2a31af 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -978,7 +978,7 @@ Setting::Handle sessionRunTime{ "sessionRunTime", 0 }; const float DEFAULT_HMD_TABLET_SCALE_PERCENT = 60.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_PREFER_STYLUS_OVER_LASER = false; const bool DEFAULT_PREFER_AVATAR_FINGER_OVER_STYLUS = false; @@ -9301,7 +9301,6 @@ void Application::updateSystemTabletMode() { if (isHMDMode()) { DependencyManager::get()->setToolbarMode(getHmdTabletBecomesToolbarSetting()); } else { - //_desktopTabletBecomesToolbarSetting.set(false); DependencyManager::get()->setToolbarMode(getDesktopTabletBecomesToolbarSetting()); } } diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 7547f04fa2..54914118c2 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -457,6 +457,7 @@ function onGeometryChanged(rect) { } } +var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700 function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person"); @@ -465,7 +466,7 @@ function onDisplayModeChanged(isHMDMode) { Script.setTimeout(function () { var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); toolbar.writeProperty("visible", false); - }, 700); + }, TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS); } } From 266c08227f23f9019001ba6b7f563bc9f358a803 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 09:29:43 -0700 Subject: [PATCH 4/5] turned an else into an else if --- scripts/simplifiedUI/ui/simplifiedUI.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 54914118c2..72442b46ed 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -461,8 +461,8 @@ var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700 function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person"); - } else { - //works for now, but not a permanent fix by any means. + } else if (Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false)) { + // works for now, but not a permanent fix by any means. Script.setTimeout(function () { var toolbar = Toolbars.getToolbar(TOOLBAR_NAME); toolbar.writeProperty("visible", false); From 6c0bbfae7608b02da8a67460f85cfbcb5cd2f718 Mon Sep 17 00:00:00 2001 From: Preston Bezos Date: Wed, 12 Jun 2019 10:02:33 -0700 Subject: [PATCH 5/5] hopefully good now --- scripts/simplifiedUI/ui/simplifiedUI.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js index 72442b46ed..0b28fc7f35 100644 --- a/scripts/simplifiedUI/ui/simplifiedUI.js +++ b/scripts/simplifiedUI/ui/simplifiedUI.js @@ -457,7 +457,7 @@ function onGeometryChanged(rect) { } } -var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700 +var TIMEOUT_BEFORE_REHIDE_TOOLBAR_MS = 700; function onDisplayModeChanged(isHMDMode) { if (isHMDMode) { Camera.setModeString("first person");