Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 18:06:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bugfixes for HMD use

Browse source
This commit is contained in:
Zach Fox 2018-04-30 14:05:44 -07:00
parent 7957c12bb9
commit 1f16c5f987
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
View file

@ -189,7 +189,7 @@ Rectangle {
z: 999; z: 999;
id: processingSnapshot; id: processingSnapshot;
anchors.fill: parent; anchors.fill: parent;
visible: !take360SnapshotButton.enabled; visible: !take360SnapshotButton.enabled && cameraToggleButton.camIsOn;
color: Qt.rgba(0.0, 0.0, 0.0, 0.8); color: Qt.rgba(0.0, 0.0, 0.0, 0.8);
// This object is always used in a popup. // This object is always used in a popup.
@ -255,7 +255,6 @@ Rectangle {
onClicked: { onClicked: {
camIsOn = !camIsOn; camIsOn = !camIsOn;
sendToScript({method: (camIsOn ? 'spectatorCameraOn' : 'spectatorCameraOff')}); sendToScript({method: (camIsOn ? 'spectatorCameraOn' : 'spectatorCameraOff')});
fieldOfViewSlider.value = 45.0;
sendToScript({method: 'updateCameravFoV', vFoV: fieldOfViewSlider.value}); sendToScript({method: 'updateCameravFoV', vFoV: fieldOfViewSlider.value});
} }
} }
@ -306,7 +305,6 @@ Rectangle {
Item { Item {
id: fieldOfView; id: fieldOfView;
visible: cameraToggleButton.camIsOn;
anchors.top: spectatorCameraImageContainer.bottom; anchors.top: spectatorCameraImageContainer.bottom;
anchors.topMargin: 8; anchors.topMargin: 8;
anchors.left: parent.left; anchors.left: parent.left;
@ -373,8 +371,8 @@ Rectangle {
text: hifi.glyphs.screen; text: hifi.glyphs.screen;
size: 32; size: 32;
color: hifi.colors.blueHighlight; color: hifi.colors.blueHighlight;
anchors.top: spectatorCameraImageContainer.bottom; anchors.top: fieldOfView.bottom;
anchors.topMargin: 13; anchors.topMargin: 8;
anchors.left: parent.left; anchors.left: parent.left;
} }
// "Monitor Shows" Switch Label // "Monitor Shows" Switch Label
@ -382,7 +380,7 @@ Rectangle {
id: monitorShowsSwitchLabel; id: monitorShowsSwitchLabel;
visible: HMD.active; visible: HMD.active;
text: "MONITOR SHOWS:"; text: "MONITOR SHOWS:";
anchors.top: spectatorCameraImageContainer.bottom; anchors.top: fieldOfView.bottom;
anchors.topMargin: 20; anchors.topMargin: 20;
anchors.left: monitorShowsSwitchLabelGlyph.right; anchors.left: monitorShowsSwitchLabelGlyph.right;
anchors.leftMargin: 6; anchors.leftMargin: 6;
@ -441,7 +439,7 @@ Rectangle {
HifiControlsUit.Button { HifiControlsUit.Button {
id: takeSnapshotButton; id: takeSnapshotButton;
visible: cameraToggleButton.camIsOn; enabled: cameraToggleButton.camIsOn;
text: "Take Still Snapshot"; text: "Take Still Snapshot";
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
color: hifi.buttons.blue; color: hifi.buttons.blue;
@ -456,7 +454,7 @@ Rectangle {
} }
HifiControlsUit.Button { HifiControlsUit.Button {
id: take360SnapshotButton; id: take360SnapshotButton;
visible: cameraToggleButton.camIsOn; enabled: cameraToggleButton.camIsOn;
text: "Take 360 Snapshot"; text: "Take 360 Snapshot";
colorScheme: hifi.colorSchemes.dark; colorScheme: hifi.colorSchemes.dark;
color: hifi.buttons.blue; color: hifi.buttons.blue;
@ -526,7 +524,7 @@ Rectangle {
break; break;
case 'enable360SnapshotButton': case 'enable360SnapshotButton':
take360SnapshotButton.text = "Take 360 Snapshot"; take360SnapshotButton.text = "Take 360 Snapshot";
take360SnapshotButton.enabled = true; take360SnapshotButton.enabled = cameraToggleButton.camIsOn;
break; break;
default: default:
console.log('Unrecognized message from spectatorCamera.js:', JSON.stringify(message)); console.log('Unrecognized message from spectatorCamera.js:', JSON.stringify(message));