From 3c3590539d3e3f61fe9f2b66b7cf8bfabe1e6a26 Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Sat, 30 Nov 2019 21:26:19 +0100
Subject: [PATCH] Add remaining double/bool settings in initStage1

---
 src/settings/settings.h                       |  6 +++
 src/settings/settings_controller.h            | 20 ++++++++++
 .../MoveCenterTabController.cpp               | 38 ++++++-------------
 3 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/src/settings/settings.h b/src/settings/settings.h
index d597c39..eb06fd5 100644
--- a/src/settings/settings.h
+++ b/src/settings/settings.h
@@ -20,6 +20,8 @@ enum class BoolSetting
     PLAYSPACE_universeCenteredRotation,
     PLAYSPACE_enableSeatedMotion,
     PLAYSPACE_adjustChaperone,
+    PLAYSPACE_showLogMatricesButton,
+    PLAYSPACE_simpleRecenter,
 
     APPLICATION_disableVersionCheck,
     APPLICATION_previousShutdownSafe,
@@ -35,6 +37,10 @@ enum class BoolSetting
 
 enum class DoubleSetting
 {
+    PLAYSPACE_heightToggleOffset,
+    PLAYSPACE_gravityStrength,
+    PLAYSPACE_flingStrength,
+
     UTILITY_desktopWidth,
 
     VIDEO_brightnessOpacityValue,
diff --git a/src/settings/settings_controller.h b/src/settings/settings_controller.h
index dedebc1..7a1b83c 100644
--- a/src/settings/settings_controller.h
+++ b/src/settings/settings_controller.h
@@ -210,6 +210,14 @@ private:
                           SettingCategory::Playspace,
                           QtInfo{ "adjustChaperone" },
                           true },
+        BoolSettingValue{ BoolSetting::PLAYSPACE_showLogMatricesButton,
+                          SettingCategory::Playspace,
+                          QtInfo{ "showLogMatricesButton" },
+                          false },
+        BoolSettingValue{ BoolSetting::PLAYSPACE_simpleRecenter,
+                          SettingCategory::Playspace,
+                          QtInfo{ "simpleRecenter" },
+                          false },
 
         BoolSettingValue{ BoolSetting::APPLICATION_disableVersionCheck,
                           SettingCategory::Application,
@@ -242,6 +250,18 @@ private:
     constexpr static auto doubleSettingSize
         = static_cast<int>( DoubleSetting::LAST_ENUMERATOR ) + 1;
     std::array<DoubleSettingValue, doubleSettingSize> m_doubleSettings{
+        DoubleSettingValue{ DoubleSetting::PLAYSPACE_heightToggleOffset,
+                            SettingCategory::Playspace,
+                            QtInfo{ "heightToggleOffset" },
+                            -1.0 },
+        DoubleSettingValue{ DoubleSetting::PLAYSPACE_gravityStrength,
+                            SettingCategory::Playspace,
+                            QtInfo{ "gravityStrength" },
+                            9.8 },
+        DoubleSettingValue{ DoubleSetting::PLAYSPACE_flingStrength,
+                            SettingCategory::Playspace,
+                            QtInfo{ "flingStrength" },
+                            1.0 },
         DoubleSettingValue{ DoubleSetting::UTILITY_desktopWidth,
                             SettingCategory::Utility,
                             QtInfo{ "desktopWidth" },
diff --git a/src/tabcontrollers/MoveCenterTabController.cpp b/src/tabcontrollers/MoveCenterTabController.cpp
index 71c0135..125f084 100644
--- a/src/tabcontrollers/MoveCenterTabController.cpp
+++ b/src/tabcontrollers/MoveCenterTabController.cpp
@@ -78,21 +78,13 @@ void MoveCenterTabController::initStage1()
     {
         m_smoothTurnRate = value.toInt();
     }
-    value = settings->value( "heightToggleOffset", m_heightToggleOffset );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_heightToggleOffset = value.toFloat();
-    }
-    value = settings->value( "gravityStrength", m_gravityStrength );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_gravityStrength = value.toFloat();
-    }
-    value = settings->value( "flingStrength", m_flingStrength );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_flingStrength = value.toFloat();
-    }
+
+    m_heightToggleOffset = static_cast<float>( settings::getSetting(
+        settings::DoubleSetting::PLAYSPACE_heightToggleOffset ) );
+    m_gravityStrength = static_cast<float>( settings::getSetting(
+        settings::DoubleSetting::PLAYSPACE_gravityStrength ) );
+    m_flingStrength = static_cast<float>( settings::getSetting(
+        settings::DoubleSetting::PLAYSPACE_flingStrength ) );
 
     m_momentumSave
         = settings::getSetting( settings::BoolSetting::PLAYSPACE_momentumSave );
@@ -102,13 +94,8 @@ void MoveCenterTabController::initStage1()
         = settings::getSetting( settings::BoolSetting::PLAYSPACE_lockYToggle );
     m_lockZToggle
         = settings::getSetting( settings::BoolSetting::PLAYSPACE_lockZToggle );
-
-    value = settings->value( "showLogMatricesButton", m_showLogMatricesButton );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_showLogMatricesButton = value.toBool();
-    }
-
+    m_showLogMatricesButton = settings::getSetting(
+        settings::BoolSetting::PLAYSPACE_showLogMatricesButton );
     m_allowExternalEdits = settings::getSetting(
         settings::BoolSetting::PLAYSPACE_allowExternalEdits );
     m_oldStyleMotion = settings::getSetting(
@@ -117,12 +104,9 @@ void MoveCenterTabController::initStage1()
         settings::BoolSetting::PLAYSPACE_universeCenteredRotation );
     m_enableSeatedMotion = settings::getSetting(
         settings::BoolSetting::PLAYSPACE_enableSeatedMotion );
+    m_simpleRecenter = settings::getSetting(
+        settings::BoolSetting::PLAYSPACE_simpleRecenter );
 
-    value = settings->value( "simpleRecenter", m_simpleRecenter );
-    if ( value.isValid() && !value.isNull() )
-    {
-        m_simpleRecenter = value.toBool();
-    }
     settings->endGroup();
     reloadOffsetProfiles();
     m_k_moveCenterSettingsUpdateCounter