diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h index 7e51619..dc31057 100644 --- a/src/settings/settings_controller.h +++ b/src/settings/settings_controller.h @@ -378,7 +378,7 @@ private: 0.5 }, DoubleSettingValue{ DoubleSetting::CHAPERONE_showDashboardDistance, SettingCategory::Video, - QtInfo{ "showDashboardDistance" }, + QtInfo{ "chaperoneShowDashboardDistance" }, 0.5 }, DoubleSettingValue{ DoubleSetting::CHAPERONE_fadeDistanceRemembered, SettingCategory::Chaperone, diff --git a/src/tabcontrollers/ChaperoneTabController.cpp b/src/tabcontrollers/ChaperoneTabController.cpp index 00d396a..31de65f 100644 --- a/src/tabcontrollers/ChaperoneTabController.cpp +++ b/src/tabcontrollers/ChaperoneTabController.cpp @@ -11,8 +11,6 @@ void ChaperoneTabController::initStage1() { auto settings = OverlayController::appSettings(); settings->beginGroup( "chaperoneSettings" ); - m_chaperoneShowDashboardDistance - = settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat(); m_fadeDistanceRemembered = settings->value( "fadeDistanceRemembered", 0.5f ).toFloat(); settings->endGroup(); @@ -515,7 +513,7 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance ) // Show Dashboard if ( isChaperoneShowDashboardEnabled() ) { - float activationDistance = m_chaperoneShowDashboardDistance; + float activationDistance = chaperoneShowDashboardDistance(); if ( distance <= activationDistance && !m_chaperoneShowDashboardActive ) { if ( !vr::VROverlay()->IsDashboardVisible() ) @@ -885,7 +883,8 @@ bool ChaperoneTabController::isChaperoneShowDashboardEnabled() const float ChaperoneTabController::chaperoneShowDashboardDistance() const { - return m_chaperoneShowDashboardDistance; + return static_cast( settings::getSetting( + settings::DoubleSetting::CHAPERONE_showDashboardDistance ) ); } Q_INVOKABLE unsigned ChaperoneTabController::getChaperoneProfileCount() @@ -1119,20 +1118,16 @@ void ChaperoneTabController::setChaperoneShowDashboardEnabled( bool value, void ChaperoneTabController::setChaperoneShowDashboardDistance( float value, bool notify ) { - if ( fabs( static_cast( m_chaperoneShowDashboardDistance - value ) ) + if ( fabs( static_cast( chaperoneShowDashboardDistance() - value ) ) > 0.005 ) { - m_chaperoneShowDashboardDistance = value; - auto settings = OverlayController::appSettings(); - settings->beginGroup( "chaperoneSettings" ); - settings->setValue( "chaperoneShowDashboardDistance", - m_chaperoneShowDashboardDistance ); - settings->endGroup(); - settings->sync(); + settings::setSetting( + settings::DoubleSetting::CHAPERONE_showDashboardDistance, + static_cast( value ) ); + if ( notify ) { - emit chaperoneShowDashboardDistanceChanged( - m_chaperoneShowDashboardDistance ); + emit chaperoneShowDashboardDistanceChanged( value ); } } } @@ -1350,7 +1345,7 @@ void ChaperoneTabController::addChaperoneProfile( profile->enableChaperoneShowDashboard = isChaperoneShowDashboardEnabled(); profile->chaperoneShowDashboardDistance - = m_chaperoneShowDashboardDistance; + = chaperoneShowDashboardDistance(); } saveChaperoneProfiles(); OverlayController::appSettings()->sync(); diff --git a/src/tabcontrollers/ChaperoneTabController.h b/src/tabcontrollers/ChaperoneTabController.h index 54d2108..7efe52c 100644 --- a/src/tabcontrollers/ChaperoneTabController.h +++ b/src/tabcontrollers/ChaperoneTabController.h @@ -144,7 +144,6 @@ private: bool m_chaperoneAlarmSoundActive = false; - float m_chaperoneShowDashboardDistance = 0.5f; bool m_chaperoneShowDashboardActive = false; unsigned settingsUpdateCounter = 0;