Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 09:42:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1322 from digisomni/fix/update-openvr

Browse source 
Update OpenVR to 1.16.8.
This commit is contained in:
Kalila 2021-09-05 04:52:46 -04:00 committed by GitHub
commit 18cc4cd776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/ports/openvr/CONTROL
View file

@ -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.

4
cmake/ports/openvr/portfile.cmake
View file

@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO ValveSoftware/openvr
REF v1.11.11
SHA512 25bddb0e82eea091fe5101d0d3de1de7bb81b4504adc0c8d8e687d2502c0167bc5a11e68bc343d7563fb4db7c917e9d0e2ea99bc1d8016d479874b0c6bd7f121
REF v1.16.8
SHA512 bc65fd2fc2aab870c7fee98f5211b7d88cd30511ce5b23fa2ac05454969b6ee56b42e422e44a16a833b317bb1328e0ed986c926e3d78abddf5fd5788ff74de91
HEAD_REF master
)

10
plugins/openvr/src/OpenVrHelpers.cpp
View file

@ -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);