Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

More bugfixes

Browse source
This commit is contained in:
Zach Fox 2018-04-30 16:12:04 -07:00
parent 47627fd1de
commit 502ce8f04f
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js
View file

@ -240,7 +240,6 @@
// 3. Camera is on; "Monitor Shows" is "HMD Preview": "url" is ""
// 4. Camera is on; "Monitor Shows" is "Camera View": "url" is "resource://spectatorCameraFrame"
function setDisplay(showCameraView) {
var url = (camera) ? (showCameraView ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame") : "";
// FIXME: temporary hack to avoid setting the display texture to hmdPreviewFrame
@ -255,9 +254,6 @@
var monitorShowsCameraView = !!Settings.getValue('spectatorCamera/monitorShowsCameraView', MONITOR_SHOWS_CAMERA_VIEW_DEFAULT);
function setMonitorShowsCameraView(showCameraView) {
setDisplay(showCameraView);
if (showCameraView === monitorShowsCameraView) {
return;
}
monitorShowsCameraView = showCameraView;
Settings.setValue('spectatorCamera/monitorShowsCameraView', showCameraView);
}
@ -588,9 +584,10 @@
if (!switchViewControllerMapping || !takeSnapshotControllerMapping) {
registerButtonMappings();
}
setDisplay(monitorShowsCameraView);
if (!isHMDMode) {
spectatorCameraOff();
setMonitorShowsCameraView(false);
} else {
setDisplay(monitorShowsCameraView);
}
}