From 30343ce11a2a034f503604e8895d90a8f774b0a1 Mon Sep 17 00:00:00 2001 From: ykeara Date: Thu, 13 Jul 2023 12:58:14 -0500 Subject: [PATCH] 5.7.3 (#632) * 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 * Revert 1.26.3 chaperone adjust changes * fix setting bug increment version --------- Co-authored-by: Chelsea Jaggi --- build_scripts/compile_version_string.txt | 2 +- src/settings/internal/settings_controller.h | 4 ++++ src/settings/settings.h | 1 + src/tabcontrollers/MoveCenterTabController.cpp | 7 +++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/build_scripts/compile_version_string.txt b/build_scripts/compile_version_string.txt index 787aff9..b4e3417 100644 --- a/build_scripts/compile_version_string.txt +++ b/build_scripts/compile_version_string.txt @@ -1 +1 @@ -5.7.2-release \ No newline at end of file +5.7.3-release \ No newline at end of file diff --git a/src/settings/internal/settings_controller.h b/src/settings/internal/settings_controller.h index 33037db..e840e91 100644 --- a/src/settings/internal/settings_controller.h +++ b/src/settings/internal/settings_controller.h @@ -289,6 +289,10 @@ private: SettingCategory::Playspace, QtInfo{ "adjustChaperone3" }, true }, + BoolSettingValue{ BoolSetting::PLAYSPACE_adjustChaperone4, + SettingCategory::Playspace, + QtInfo{ "adjustChaperone4" }, + false }, BoolSettingValue{ BoolSetting::APPLICATION_disableVersionCheck, SettingCategory::Application, diff --git a/src/settings/settings.h b/src/settings/settings.h index 56b3de5..6c57496 100644 --- a/src/settings/settings.h +++ b/src/settings/settings.h @@ -25,6 +25,7 @@ enum class BoolSetting PLAYSPACE_adjustChaperone2, PLAYSPACE_enableUncalMotion, PLAYSPACE_adjustChaperone3, + PLAYSPACE_adjustChaperone4, APPLICATION_disableVersionCheck, APPLICATION_previousShutdownSafe, diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp index 5e936b9..12e7531 100644 --- a/src/tabcontrollers/MoveCenterTabController.cpp +++ b/src/tabcontrollers/MoveCenterTabController.cpp @@ -457,12 +457,12 @@ void MoveCenterTabController::setFrictionPercent( int value, bool notify ) bool MoveCenterTabController::adjustChaperone() const { return settings::getSetting( - settings::BoolSetting::PLAYSPACE_adjustChaperone3 ); + settings::BoolSetting::PLAYSPACE_adjustChaperone4 ); } void MoveCenterTabController::setAdjustChaperone( bool value, bool notify ) { - settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone3, + settings::setSetting( settings::BoolSetting::PLAYSPACE_adjustChaperone4, value ); if ( notify ) @@ -2771,6 +2771,9 @@ void MoveCenterTabController::updateSpace( bool forceUpdate ) // behavior // as of SVR 1.26.3 instead of 2x offset we have 1x offset and universe // centerS + // as of SVR 1.26.4 1.26.3 changes are reverted as Such Adjust Chaperone + // Should Not Be Needed We Will leave in Adjust Chaperone at this point but + // make sure it defaults to off if ( adjustChaperone() ) {