mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 11:28:03 +02:00
Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd
This commit is contained in:
commit
44d0e0ba1a
1 changed files with 18 additions and 1 deletions
|
@ -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);
|
||||||
|
|
Loading…
Reference in a new issue