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

Convert m_chaperoneHapticFeedbackDistance to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 81bbec52b4
commit 13c8eabeb0
3 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/ChaperoneTabController.cpp
+10 -15
View File
@@ -11,8 +11,6 @@ void ChaperoneTabController::initStage1()
{
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
m_chaperoneHapticFeedbackDistance
= settings->value( "chaperoneHapticFeedbackDistance", 0.5f ).toFloat();
m_chaperoneAlarmSoundDistance
= settings->value( "chaperoneAlarmSoundDistance", 0.5f ).toFloat();
m_chaperoneShowDashboardDistance
@@ -417,7 +415,7 @@ void ChaperoneTabController::handleChaperoneWarnings( float distance )
if ( isChaperoneHapticFeedbackEnabled() )
{
float activationDistance = m_chaperoneHapticFeedbackDistance;
float activationDistance = chaperoneHapticFeedbackDistance();
if ( distance <= activationDistance && proxSensorOverrideState )
{
@@ -847,7 +845,8 @@ bool ChaperoneTabController::isChaperoneHapticFeedbackEnabled() const
float ChaperoneTabController::chaperoneHapticFeedbackDistance() const
{
return m_chaperoneHapticFeedbackDistance;
return static_cast<float>( settings::getSetting(
settings::DoubleSetting::CHAPERONE_hapticFeedbackDistance ) );
}
bool ChaperoneTabController::isChaperoneAlarmSoundEnabled() const
@@ -1003,20 +1002,16 @@ void ChaperoneTabController::setChaperoneHapticFeedbackDistance( float value,
bool notify )
{
if ( fabs(
static_cast<double>( m_chaperoneHapticFeedbackDistance - value ) )
static_cast<double>( chaperoneHapticFeedbackDistance() - value ) )
> 0.005 )
{
m_chaperoneHapticFeedbackDistance = value;
auto settings = OverlayController::appSettings();
settings->beginGroup( "chaperoneSettings" );
settings->setValue( "chaperoneHapticFeedbackDistance",
m_chaperoneHapticFeedbackDistance );
settings->endGroup();
settings->sync();
settings::setSetting(
settings::DoubleSetting::CHAPERONE_hapticFeedbackDistance,
static_cast<double>( value ) );
if ( notify )
{
emit chaperoneHapticFeedbackDistanceChanged(
m_chaperoneHapticFeedbackDistance );
emit chaperoneHapticFeedbackDistanceChanged( value );
}
}
}
@@ -1351,7 +1346,7 @@ void ChaperoneTabController::addChaperoneProfile(
profile->enableChaperoneHapticFeedback
= isChaperoneHapticFeedbackEnabled();
profile->chaperoneHapticFeedbackDistance
= m_chaperoneHapticFeedbackDistance;
= chaperoneHapticFeedbackDistance();
profile->enableChaperoneAlarmSound = isChaperoneAlarmSoundEnabled();
profile->chaperoneAlarmSoundLooping = isChaperoneAlarmSoundLooping();
profile->chaperoneAlarmSoundAdjustVolume