Convert m_settingsLeftHandTurnEnabled to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent c1b1756ccf
commit 1061c39252
2 changed files with 11 additions and 16 deletions
+11 -15
View File
@@ -39,8 +39,6 @@ namespace advsettings
{ {
void MoveCenterTabController::initStage1() void MoveCenterTabController::initStage1()
{ {
m_settingsLeftHandTurnEnabled
= settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft );
m_settingsRightHandTurnEnabled = settings::getSetting( m_settingsRightHandTurnEnabled = settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindRight ); settings::BoolSetting::PLAYSPACE_turnBindRight );
m_dragBounds m_dragBounds
@@ -225,7 +223,7 @@ void MoveCenterTabController::outputLogSettings()
{ {
LOG( INFO ) << "LOADED SETTINGS: Right Hand Space-Turn Bind Enabled"; LOG( INFO ) << "LOADED SETTINGS: Right Hand Space-Turn Bind Enabled";
} }
if ( m_settingsLeftHandTurnEnabled ) if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
{ {
LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Turn Bind Enabled"; LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Turn Bind Enabled";
} }
@@ -634,23 +632,19 @@ void MoveCenterTabController::setMoveShortcutLeft( bool value, bool notify )
bool MoveCenterTabController::turnBindLeft() const bool MoveCenterTabController::turnBindLeft() const
{ {
return m_settingsLeftHandTurnEnabled; return settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindLeft );
} }
void MoveCenterTabController::setTurnBindLeft( bool value, bool notify ) void MoveCenterTabController::setTurnBindLeft( bool value, bool notify )
{ {
m_settingsLeftHandTurnEnabled = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft,
auto settings = OverlayController::appSettings(); value );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "turnBindLeft", m_settingsLeftHandTurnEnabled );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit turnBindLeftChanged( m_settingsLeftHandTurnEnabled ); emit turnBindLeftChanged( value );
} }
LOG( INFO ) << "CHANGED SETTINGS: Left Hand Space-Turn Bind Enable Set: "
<< m_settingsLeftHandTurnEnabled;
} }
bool MoveCenterTabController::turnBindRight() const bool MoveCenterTabController::turnBindRight() const
@@ -1908,7 +1902,8 @@ void MoveCenterTabController::swapSpaceDragToRightHandOverride(
void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive ) void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive )
{ {
if ( !m_settingsLeftHandTurnEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
{ {
return; return;
} }
@@ -1995,7 +1990,8 @@ void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive )
void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn( void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn(
bool overrideLeftHandTurnActive ) bool overrideLeftHandTurnActive )
{ {
if ( !m_settingsLeftHandTurnEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindLeft ) )
{ {
return; return;
} }
@@ -125,7 +125,6 @@ private:
bool m_moveShortcutLeftPressed = false; bool m_moveShortcutLeftPressed = false;
vr::TrackedDeviceIndex_t m_activeMoveController; vr::TrackedDeviceIndex_t m_activeMoveController;
float m_lastControllerPosition[3]; float m_lastControllerPosition[3];
bool m_settingsLeftHandTurnEnabled = false;
bool m_settingsRightHandTurnEnabled = false; bool m_settingsRightHandTurnEnabled = false;
unsigned m_dragComfortFactor = 0; unsigned m_dragComfortFactor = 0;
unsigned m_turnComfortFactor = 0; unsigned m_turnComfortFactor = 0;