From b3c36596f69a7a4f73dd7b62db69200f74d837ab Mon Sep 17 00:00:00 2001 From: ykeara Date: Thu, 18 May 2023 14:50:29 -0500 Subject: [PATCH] 571 (#628) * Option to fade out chaperone when HMD goes below a configured height Useful for setups in which you have a seat just outside your VR space, or like to sit in the middle of your space for any amount of time. Will fade out the boundaries to 0% opacity over 5 seconds, 5 seconds after you sit down. Standing back up to the configured height will make them pop back in immediately. Can be found under Chaperone -> Additional Settings. * Update format.sh to require clang-format v10 * Use fade distance instead of opacity, opacity inconsistently applied * Bugfixes (#624) * stop crashing on HMD Init Errors, as well as bypass force quit on all steamvr Init Errors * add qtc clang to gitignore * add app volume adjustment * adjust app volume placement in menu * fix type error * update version string, prevent us from exiting when interface reported bad --------- Co-authored-by: Chelsea Jaggi --- build_scripts/compile_version_string.txt | 2 +- src/openvr/openvr_init.cpp | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt index 2cfbd00..fe014ab 100644 --- a/build_scripts/compile_version_string.txt +++ b/build_scripts/compile_version_string.txt @@ -1 +1 @@ -5.7.0-release \ No newline at end of file +5.7.1-release \ No newline at end of file diff --git a/src/openvr/openvr_init.cpp b/src/openvr/openvr_init.cpp index 73779ef..ef0ea29 100644 --- a/src/openvr/openvr_init.cpp +++ b/src/openvr/openvr_init.cpp @@ -60,14 +60,22 @@ void initializeOpenVR( const OpenVrInitializationType initType ) // Specific error messages are unlikely to be necessary since both the type // and version are in the string and will be output. auto reportVersionError = []( const char* const interfaceAndVersion ) { - QMessageBox::critical( - nullptr, - "OpenVR Advanced Settings Overlay", - "OpenVR version is too outdated. Please update OpenVR." ); - throw std::runtime_error( - std::string( "OpenVR version is too outdated: Interface version " ) - + std::string( interfaceAndVersion ) - + std::string( " not found." ) ); + // 5.7.1 + // Stop behavior from exiting out, again seems to be related to some + // sort of race condition in non-native Headsets (i.e. not lighthouse) + + // QMessageBox::critical( + // nullptr, + // "OpenVR Advanced Settings Overlay", + // "OpenVR version is too outdated. Please update OpenVR." ); + + LOG( WARNING ) << "OpenVR version is invalid: Interface version " + << interfaceAndVersion << " not found."; + // throw std::runtime_error( + // std::string( "OpenVR version is too outdated: Interface + // version " ) + // + std::string( interfaceAndVersion ) + // + std::string( " not found." ) ); }; // Check whether OpenVR is too outdated