From 1aeadcbc648c9cefb760e7241f4e0bf1e87da320 Mon Sep 17 00:00:00 2001 From: David Back Date: Wed, 22 Nov 2017 11:38:52 -0800 Subject: [PATCH 1/2] prevent spectator cam from updating secondary cam aspect ratio when its in use by mirrors --- .../marketplace/spectator-camera/spectatorCamera.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js index f0b943ad92..9eb543e768 100644 --- a/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js +++ b/unpublishedScripts/marketplace/spectator-camera/spectatorCamera.js @@ -311,7 +311,10 @@ viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 }; } updateOverlay(); - spectatorCameraConfig.resetSizeSpectatorCamera(geometryChanged.width, geometryChanged.height); + // if secondary camera is currently being used for mirror projection then don't update it's aspect ratio (will be done in spectatorCameraOn) + if (!spectatorCameraConfig.mirrorProjection) { + spectatorCameraConfig.resetSizeSpectatorCamera(geometryChanged.width, geometryChanged.height); + } setDisplay(monitorShowsCameraView); } From 8364700b7aa8a7b8311c04235c6570d4610f2771 Mon Sep 17 00:00:00 2001 From: "Anthony J. Thibault" Date: Tue, 28 Nov 2017 12:19:16 -0800 Subject: [PATCH 2/2] Head tracking bug fix for vive HMD users --- plugins/openvr/src/ViveControllerManager.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/openvr/src/ViveControllerManager.h b/plugins/openvr/src/ViveControllerManager.h index 6767aafad2..772facc21f 100644 --- a/plugins/openvr/src/ViveControllerManager.h +++ b/plugins/openvr/src/ViveControllerManager.h @@ -194,7 +194,7 @@ private: bool _overrideHands { false }; mutable std::recursive_mutex _lock; - bool _hmdTrackingEnabled { false }; + bool _hmdTrackingEnabled { true }; QString configToString(Config config); friend class ViveControllerManager;