Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 22:36:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

control-0 toggles display, and display itself only toggles when camera is

Browse source 
on
This commit is contained in:
howard-stearns 2017-06-08 10:41:09 -07:00
parent d15657616a
commit ce2053e3b8
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/system/spectatorCamera.js
View file

@ -174,6 +174,7 @@
button.clicked.connect(onTabletButtonClicked); button.clicked.connect(onTabletButtonClicked);
tablet.screenChanged.connect(onTabletScreenChanged); tablet.screenChanged.connect(onTabletScreenChanged);
Window.domainChanged.connect(spectatorCameraOff); Window.domainChanged.connect(spectatorCameraOff);
Controller.keyPressEvent.connect(keyPressEvent);
viewFinderOverlay = false; viewFinderOverlay = false;
camera = false; camera = false;
} }
@ -213,11 +214,19 @@
return; return;
} }
monitorShowsCameraView = showCameraView; monitorShowsCameraView = showCameraView;
var url = showCameraView ? (isUpdateRenderWired ? "http://selfieFrame" : CAMERA_PREVIEW_WHEN_OFF) : ""; var url = (showCameraView && isUpdateRenderWired) ? "http://selfieFrame" : "";
print('setDisplayTexture', url, Window.setDisplayTexture(url);
Window.setDisplayTexture(url));
Settings.setValue('spectatorCamera/monitorShowsCameraView', showCameraView); Settings.setValue('spectatorCamera/monitorShowsCameraView', showCameraView);
} }
function setMonitorShowsCameraViewAndSendToQml(showCameraView) {
setMonitorShowsCameraView(showCameraView);
sendToQml({ method: 'updateMonitorShowsSwitch', params: showCameraView });
}
function keyPressEvent(event) {
if ((event.text === "0") && !event.isAutoRepeat && !event.isShifted && !event.isMeta && event.isControl && !event.isAlt) {
setMonitorShowsCameraViewAndSendToQml(!monitorShowsCameraView);
}
}
// //
// Function Name: onTabletButtonClicked() // Function Name: onTabletButtonClicked()
@ -243,9 +252,8 @@
shouldActivateButton = true; shouldActivateButton = true;
tablet.loadQMLSource("../SpectatorCamera.qml"); tablet.loadQMLSource("../SpectatorCamera.qml");
onSpectatorCameraScreen = true; onSpectatorCameraScreen = true;
sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera });; sendToQml({ method: 'updateSpectatorCameraCheckbox', params: !!camera });
setMonitorShowsCameraView(monitorShowsCameraView); setMonitorShowsCameraViewAndSendToQml(monitorShowsCameraView);
sendToQml({ method: 'updateMonitorShowsSwitch', params: monitorShowsCameraView });
} }
} }
@ -337,6 +345,7 @@
tablet.removeButton(button); tablet.removeButton(button);
button.clicked.disconnect(onTabletButtonClicked); button.clicked.disconnect(onTabletButtonClicked);
tablet.screenChanged.disconnect(onTabletScreenChanged); tablet.screenChanged.disconnect(onTabletScreenChanged);
Controller.keyPressEvent.disconnect(keyPressEvent);
} }
// //