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

Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd

Browse source
This commit is contained in:
RebeccaStankus 2019-08-19 09:16:19 -07:00
commit 44d0e0ba1a
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -428,7 +428,16 @@ function updateInputDeviceMutedOverlay(isMuted) {
function onDesktopInputDeviceMutedChanged(isMuted) { function onDesktopInputDeviceMutedChanged(isMuted) {
updateInputDeviceMutedOverlay(isMuted); if (!HMD.active) {
updateInputDeviceMutedOverlay(isMuted);
}
}
function onHMDInputDeviceMutedChanged(isMuted) {
if (HMD.active) {
updateInputDeviceMutedOverlay(isMuted);
}
} }
@ -451,6 +460,12 @@ function onDisplayModeChanged(isHMDMode) {
if (isHMDMode) { if (isHMDMode) {
Camera.setModeString("first person"); Camera.setModeString("first person");
} }
if (isHMDMode) {
onHMDInputDeviceMutedChanged(Audio.mutedHMD);
} else {
onDesktopInputDeviceMutedChanged(Audio.mutedDesktop);
}
} }
function onToolbarVisibleChanged(isVisible, toolbarName) { function onToolbarVisibleChanged(isVisible, toolbarName) {
@ -531,6 +546,7 @@ function startup() {
updateInputDeviceMutedOverlay(Audio.muted); updateInputDeviceMutedOverlay(Audio.muted);
updateOutputDeviceMutedOverlay(isOutputMuted()); updateOutputDeviceMutedOverlay(isOutputMuted());
Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged); Audio.mutedDesktopChanged.connect(onDesktopInputDeviceMutedChanged);
Audio.mutedHMDChanged.connect(onHMDInputDeviceMutedChanged);
Window.geometryChanged.connect(onGeometryChanged); Window.geometryChanged.connect(onGeometryChanged);
HMD.displayModeChanged.connect(onDisplayModeChanged); HMD.displayModeChanged.connect(onDisplayModeChanged);
Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay); Audio.avatarGainChanged.connect(maybeUpdateOutputDeviceMutedOverlay);
@ -581,6 +597,7 @@ function shutdown() {
emote.unload(); emote.unload();
Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged); Audio.mutedDesktopChanged.disconnect(onDesktopInputDeviceMutedChanged);
Audio.mutedHMDChanged.disconnect(onHMDInputDeviceMutedChanged);
Window.geometryChanged.disconnect(onGeometryChanged); Window.geometryChanged.disconnect(onGeometryChanged);
HMD.displayModeChanged.disconnect(onDisplayModeChanged); HMD.displayModeChanged.disconnect(onDisplayModeChanged);
Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay); Audio.avatarGainChanged.disconnect(maybeUpdateOutputDeviceMutedOverlay);