From 2fbe031dbfb61599dc175bd2a4c1f1e51f73df30 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Thu, 26 Aug 2021 17:59:55 -0400 Subject: [PATCH 1/3] Update OpenVR to 1.16.8 in VCPKG, hash is still incorrect. --- cmake/ports/openvr/CONTROL | 2 +- cmake/ports/openvr/portfile.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/ports/openvr/CONTROL b/cmake/ports/openvr/CONTROL index b0f337d0a9..b9e748537b 100644 --- a/cmake/ports/openvr/CONTROL +++ b/cmake/ports/openvr/CONTROL @@ -1,3 +1,3 @@ Source: openvr -Version: 1.0.16 +Version: 1.16.8 Description: an API and runtime that allows access to VR hardware from multiple vendors without requiring that applications have specific knowledge of the hardware they are targeting. diff --git a/cmake/ports/openvr/portfile.cmake b/cmake/ports/openvr/portfile.cmake index bcbac8613a..c7d514a22f 100644 --- a/cmake/ports/openvr/portfile.cmake +++ b/cmake/ports/openvr/portfile.cmake @@ -3,7 +3,7 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr - REF v1.11.11 + REF v1.16.8 SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121 HEAD_REF master ) From 826149ae7a4d5498a102808916f8975c6a1484bb Mon Sep 17 00:00:00 2001 From: Kalila L Date: Fri, 27 Aug 2021 00:55:35 -0400 Subject: [PATCH 2/3] Update hash of OpenVR to 1.16.8 in VCPKG. --- cmake/ports/openvr/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ports/openvr/portfile.cmake b/cmake/ports/openvr/portfile.cmake index c7d514a22f..76859b523b 100644 --- a/cmake/ports/openvr/portfile.cmake +++ b/cmake/ports/openvr/portfile.cmake @@ -4,7 +4,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO ValveSoftware/openvr REF v1.16.8 - SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121 + SHA512 bc65fd2fc2aab870c7fee98f5211b7d88cd30511ce5b23fa2ac05454969b6ee56b42e422e44a16a833b317bb1328e0ed986c926e3d78abddf5fd5788ff74de91 HEAD_REF master ) From bfa10852a22c75e631f31bc890d8127769dace64 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Sat, 28 Aug 2021 17:37:34 -0400 Subject: [PATCH 3/3] Fix OpenVrHelpers.cpp for updating OpenVR to 1.16.8. --- plugins/openvr/src/OpenVrHelpers.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/openvr/src/OpenVrHelpers.cpp b/plugins/openvr/src/OpenVrHelpers.cpp index eed2242602..d22aecaa1f 100644 --- a/plugins/openvr/src/OpenVrHelpers.cpp +++ b/plugins/openvr/src/OpenVrHelpers.cpp @@ -411,6 +411,14 @@ void showMinSpecWarning() { if (!vrOverlay) { qFatal("Unable to initialize SteamVR overlay manager"); } + auto vrChaperone = vr::VRChaperone(); + if (!vrChaperone) { + qFatal("Unable to initialize SteamVR chaperone"); + } + auto vrCompositor = vr::VRCompositor(); + if (!vrCompositor) { + qFatal("Unable to initialize SteamVR compositor"); + } vr::VROverlayHandle_t minSpecFailedOverlay = 0; if (vr::VROverlayError_None != vrOverlay->CreateOverlay(FAILED_MIN_SPEC_OVERLAY_NAME, FAILED_MIN_SPEC_OVERLAY_FRIENDLY_NAME, &minSpecFailedOverlay)) { @@ -443,7 +451,7 @@ void showMinSpecWarning() { }); #endif - vrSystem->ResetSeatedZeroPose(); + vrChaperone->ResetZeroPose(vrCompositor->GetTrackingSpace()); QString imagePath = PathUtils::resourcesPath() + "/images/steam-min-spec-failed.png"; vrOverlay->SetOverlayFromFile(minSpecFailedOverlay, imagePath.toLocal8Bit().toStdString().c_str()); vrOverlay->SetOverlayWidthInMeters(minSpecFailedOverlay, 1.4f);