SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert m_enableChaperoneShowDashboard to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent b6f0e22770
commit be6a21d321
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+12 -15
View File
@@ -18,8 +18,6 @@ void ChaperoneTabController::initStage1()
= settings->value( "chaperoneHapticFeedbackDistance", 0.5f ).toFloat();
m_chaperoneAlarmSoundDistance
= settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat();
m_enableChaperoneShowDashboard
= settings->value( "chaperoneShowDashboardEnabled", false ).toBool();
m_chaperoneShowDashboardDistance
= settings->value( "chaperoneShowDashboardDistance", 0.5f ).toFloat();
m_disableChaperone = settings->value( "disableChaperone", false ).toBool();
@@ -523,7 +521,7 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance )
}
// Show Dashboard
if ( m_enableChaperoneShowDashboard )
if ( isChaperoneShowDashboardEnabled() )
{
float activationDistance = m_chaperoneShowDashboardDistance;
if ( distance <= activationDistance && !m_chaperoneShowDashboardActive )
@@ -885,7 +883,8 @@ float ChaperoneTabController::chaperoneAlarmSoundDistance() const
bool ChaperoneTabController::isChaperoneShowDashboardEnabled() const
{
return m_enableChaperoneShowDashboard;
return settings::getSetting(
settings::BoolSetting::CHAPERONE_chaperoneShowDashboardEnabled );
}
float ChaperoneTabController::chaperoneShowDashboardDistance() const
@@ -1118,20 +1117,17 @@ void ChaperoneTabController::setChaperoneAlarmSoundDistance( float value,
void ChaperoneTabController::setChaperoneShowDashboardEnabled( bool value,
bool notify )
{
if ( m_enableChaperoneShowDashboard != value )
if ( isChaperoneShowDashboardEnabled() != value )
{
m_enableChaperoneShowDashboard = value;
m_chaperoneShowDashboardActive = false;
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
settings->setValue( "chaperoneShowDashboardEnabled",
m_enableChaperoneShowDashboard );
settings->endGroup();
settings->sync();
settings::setSetting(
settings::BoolSetting::CHAPERONE_chaperoneShowDashboardEnabled,
value );
if ( notify )
{
emit chaperoneShowDashboardEnabledChanged(
m_enableChaperoneShowDashboard );
emit chaperoneShowDashboardEnabledChanged( value );
}
}
}
@@ -1365,7 +1361,8 @@ void ChaperoneTabController::addChaperoneProfile(
profile->chaperoneAlarmSoundAdjustVolume
= isChaperoneAlarmSoundAdjustVolume();
profile->chaperoneAlarmSoundDistance = m_chaperoneAlarmSoundDistance;
profile->enableChaperoneShowDashboard = m_enableChaperoneShowDashboard;
profile->enableChaperoneShowDashboard
= isChaperoneShowDashboardEnabled();
profile->chaperoneShowDashboardDistance
= m_chaperoneShowDashboardDistance;
}
src/tabcontrollers/ChaperoneTabController.h
-1
View File
@@ -148,7 +148,6 @@ private:
float m_chaperoneAlarmSoundDistance = 0.5f;
bool m_chaperoneAlarmSoundActive = false;
bool m_enableChaperoneShowDashboard = false;
float m_chaperoneShowDashboardDistance = 0.5f;
bool m_chaperoneShowDashboardActive = false;