Convert m_settingsRightHandTurnEnabled to new settings API

This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 1061c39252
commit f91328298b
2 changed files with 9 additions and 19 deletions
+9 -18
View File
@@ -39,8 +39,6 @@ namespace advsettings
{ {
void MoveCenterTabController::initStage1() void MoveCenterTabController::initStage1()
{ {
m_settingsRightHandTurnEnabled = settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindRight );
m_dragBounds m_dragBounds
= settings::getSetting( settings::BoolSetting::PLAYSPACE_dragBounds ); = settings::getSetting( settings::BoolSetting::PLAYSPACE_dragBounds );
m_turnBounds m_turnBounds
@@ -219,10 +217,6 @@ void MoveCenterTabController::outputLogSettings()
{ {
LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Drag Bind Enabled"; LOG( INFO ) << "LOADED SETTINGS: Left Hand Space-Drag Bind Enabled";
} }
if ( m_settingsRightHandTurnEnabled )
{
LOG( INFO ) << "LOADED SETTINGS: Right Hand Space-Turn Bind Enabled";
}
if ( settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBindLeft ) ) 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";
@@ -649,23 +643,18 @@ void MoveCenterTabController::setTurnBindLeft( bool value, bool notify )
bool MoveCenterTabController::turnBindRight() const bool MoveCenterTabController::turnBindRight() const
{ {
return m_settingsRightHandTurnEnabled; return settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindRight );
} }
void MoveCenterTabController::setTurnBindRight( bool value, bool notify ) void MoveCenterTabController::setTurnBindRight( bool value, bool notify )
{ {
m_settingsRightHandTurnEnabled = value; settings::setSetting( settings::BoolSetting::PLAYSPACE_turnBindRight,
auto settings = OverlayController::appSettings(); value );
settings->beginGroup( "playspaceSettings" );
settings->setValue( "turnBindRight", m_settingsRightHandTurnEnabled );
settings->endGroup();
settings->sync();
if ( notify ) if ( notify )
{ {
emit turnBindRightChanged( m_settingsRightHandTurnEnabled ); emit turnBindRightChanged( value );
} }
LOG( INFO ) << "CHANGED SETTINGS: Right Hand Space-Turn Bind Enable Set: "
<< m_settingsRightHandTurnEnabled;
} }
bool MoveCenterTabController::dragBounds() const bool MoveCenterTabController::dragBounds() const
@@ -1946,7 +1935,8 @@ void MoveCenterTabController::leftHandSpaceTurn( bool leftHandTurnActive )
void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive ) void MoveCenterTabController::rightHandSpaceTurn( bool rightHandTurnActive )
{ {
if ( !m_settingsRightHandTurnEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindRight ) )
{ {
return; return;
} }
@@ -2033,7 +2023,8 @@ void MoveCenterTabController::optionalOverrideLeftHandSpaceTurn(
void MoveCenterTabController::optionalOverrideRightHandSpaceTurn( void MoveCenterTabController::optionalOverrideRightHandSpaceTurn(
bool overrideRightHandTurnActive ) bool overrideRightHandTurnActive )
{ {
if ( !m_settingsRightHandTurnEnabled ) if ( !settings::getSetting(
settings::BoolSetting::PLAYSPACE_turnBindRight ) )
{ {
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_settingsRightHandTurnEnabled = false;
unsigned m_dragComfortFactor = 0; unsigned m_dragComfortFactor = 0;
unsigned m_turnComfortFactor = 0; unsigned m_turnComfortFactor = 0;
bool m_dragBounds = false; bool m_dragBounds = false;