Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleTriggerValues

This commit is contained in:
David Back 2018-07-27 09:23:26 -07:00
commit 1d8b7bea65

View file

@ -6201,6 +6201,9 @@ PickRay Application::computePickRay(float x, float y) const {
getApplicationCompositor().computeHmdPickRay(pickPoint, result.origin, result.direction);
} else {
pickPoint /= getCanvasSize();
if (_myCamera.getMode() == CameraMode::CAMERA_MODE_MIRROR) {
pickPoint.x = 1.0f - pickPoint.x;
}
QMutexLocker viewLocker(&_viewMutex);
_viewFrustum.computePickRay(pickPoint.x, pickPoint.y, result.origin, result.direction);
}