Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 15:24:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi into fix-vive-head-pose

Browse source
This commit is contained in:
Dante Ruiz 2017-11-29 10:50:37 -08:00
commit eba8a6e17b
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/openvr/src/ViveControllerManager.h
View file

@ -194,7 +194,7 @@ private:
bool _overrideHands { false }; bool _overrideHands { false };
mutable std::recursive_mutex _lock; mutable std::recursive_mutex _lock;
bool _hmdTrackingEnabled { false }; bool _hmdTrackingEnabled { true };
QString configToString(Config config); QString configToString(Config config);
friend class ViveControllerManager; friend class ViveControllerManager;

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

@ -311,7 +311,10 @@
viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 }; viewFinderOverlayDim = { x: glassPaneWidth, y: -glassPaneWidth, z: 0 };
} }
updateOverlay(); updateOverlay();
// 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); spectatorCameraConfig.resetSizeSpectatorCamera(geometryChanged.width, geometryChanged.height);
}
setDisplay(monitorShowsCameraView); setDisplay(monitorShowsCameraView);
} }