From 500fe0a98ff2eb57cf05fa72723f609c8fb1e78b Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sun, 1 Dec 2019 15:09:50 +0100
Subject: [PATCH] Convert m_turnBounds to new settings API

---
 .../MoveCenterTabController.cpp               | 24 +++++++------------
 src/tabcontrollers/MoveCenterTabController.h  |  1 -
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index f00d47f..2b885f9 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -39,9 +39,6 @@ namespace advsettings
 {
 void MoveCenterTabController::initStage1()
 {
-    m_turnBounds
-        = settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBounds );
-
     m_dragComfortFactor = static_cast<unsigned int>( settings::getSetting(
         settings::IntSetting::PLAYSPACE_dragComfortFactor ) );
     m_turnComfortFactor = static_cast<unsigned int>( settings::getSetting(
@@ -628,30 +625,25 @@ void MoveCenterTabController::setDragBounds( bool value, bool notify )
 
 bool MoveCenterTabController::turnBounds() const
 {
-    return m_turnBounds;
+    return settings::getSetting( settings::BoolSetting::PLAYSPACE_turnBounds );
 }
 
 void MoveCenterTabController::setTurnBounds( bool value, bool notify )
 {
     // detect deactivate
-    if ( m_turnBounds && !value )
+    if ( turnBounds() && !value )
     {
         // set force bounds back to default on deactivate
         vr::VRChaperone()->ForceBoundsVisible(
             parent->m_chaperoneTabController.forceBounds() );
     }
-    m_turnBounds = value;
-    auto settings = OverlayController::appSettings();
-    settings->beginGroup( "playspaceSettings" );
-    settings->setValue( "turnBounds", m_turnBounds );
-    settings->endGroup();
-    settings->sync();
+
+    settings::setSetting( settings::BoolSetting::PLAYSPACE_turnBounds, value );
+
     if ( notify )
     {
-        emit turnBoundsChanged( m_turnBounds );
+        emit turnBoundsChanged( value );
     }
-    LOG( INFO ) << "CHANGED SETTINGS: Space Turn Force Bounds set: "
-                << m_turnBounds;
 }
 
 unsigned MoveCenterTabController::dragComfortFactor() const
@@ -2966,13 +2958,13 @@ void MoveCenterTabController::eventLoopTick(
             {
                 vr::VRChaperone()->ForceBoundsVisible( true );
             }
-            else if ( m_turnBounds
+            else if ( turnBounds()
                       && m_activeTurnHand != vr::TrackedControllerRole_Invalid )
             {
                 vr::VRChaperone()->ForceBoundsVisible( true );
             }
             // only set back to default every frame if setting is enabled
-            else if ( m_turnBounds || dragBounds() )
+            else if ( turnBounds() || dragBounds() )
             {
                 vr::VRChaperone()->ForceBoundsVisible(
                     parent->m_chaperoneTabController.forceBounds() );
diff --git a/src/tabcontrollers/MoveCenterTabController.h b/src/tabcontrollers/MoveCenterTabController.h
index cfface9..051ed92 100644
--- a/src/tabcontrollers/MoveCenterTabController.h
+++ b/src/tabcontrollers/MoveCenterTabController.h
@@ -127,7 +127,6 @@ private:
     float m_lastControllerPosition[3];
     unsigned m_dragComfortFactor = 0;
     unsigned m_turnComfortFactor = 0;
-    bool m_turnBounds = false;
     bool m_heightToggle = false;
     float m_heightToggleOffset = -1.0f;
     float m_gravityFloor = 0.0f;