fix(calibration): Fixed an issue where calibration settings were not …

…saved feat(settings): Added a default parameter to settings load
benaclejames · Jul 26, 2023 · f95570f · f95570f
1 parent 7d9cd4c
commit f95570f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/VRCFaceTracking.Core/Contracts/Services/ILocalSettingsService.cs b/VRCFaceTracking.Core/Contracts/Services/ILocalSettingsService.cs
@@ -2,7 +2,7 @@
 
 public interface ILocalSettingsService
 {
-    Task<T> ReadSettingAsync<T>(string key);
+    Task<T> ReadSettingAsync<T>(string key, T? defaultValue = default);
 
     Task SaveSettingAsync<T>(string key, T value);
 }
diff --git a/VRCFaceTracking.Core/Params/Data/UnifiedTrackingMutator.cs b/VRCFaceTracking.Core/Params/Data/UnifiedTrackingMutator.cs
@@ -50,7 +50,7 @@ public UnifiedTrackingMutator(ILogger<UnifiedTrackingMutator> logger, IDispatche
             _dispatcherService = dispatcherService;
             _localSettingsService = localSettingsService;
 
-            Enabled = true;
+            Enabled = false;
             ContinuousCalibration = true;
             CalibrationWeight = 0.2f;
         }
@@ -177,20 +177,20 @@ public void SetSmoothness(float setValue = 0.0f)
         public async Task SaveCalibration()
         {
             _logger.LogDebug("Saving configuration...");
-            await _localSettingsService.SaveSettingAsync("Mutation", mutationData);
+            await _localSettingsService.SaveSettingAsync("CalibrationEnabled", Enabled);
+            await _localSettingsService.SaveSettingAsync("CalibrationWeight", CalibrationWeight);
+            await _localSettingsService.SaveSettingAsync("ContinuousCalibrationEnabled", ContinuousCalibration);
+            await _localSettingsService.SaveSettingAsync("Mutations", mutationData);
         }
 
         public async void LoadCalibration()
         {
             // Try to load config and propogate data into Unified if they exist.
             _logger.LogDebug("Reading configuration...");
-            mutationData = await _localSettingsService.ReadSettingAsync<UnifiedMutationConfig>("Mutation");
-            // If the config is null, create a new one.
-            if (mutationData.ShapeMutations == null)
-            {
-                _logger.LogDebug("Configuration not found. Creating new configuration...");
-                mutationData = new();
-            }
+            Enabled = await _localSettingsService.ReadSettingAsync<bool>("CalibrationEnabled");
+            CalibrationWeight = await _localSettingsService.ReadSettingAsync<float>("CalibrationWeight", 0.2f);
+            ContinuousCalibration = await _localSettingsService.ReadSettingAsync<bool>("ContinuousCalibrationEnabled", true);
+            mutationData = await _localSettingsService.ReadSettingAsync<UnifiedMutationConfig>("Mutation", new());
             _logger.LogDebug("Configuration loaded.");
         }
 

diff --git a/VRCFaceTracking/Services/LocalSettingsService.cs b/VRCFaceTracking/Services/LocalSettingsService.cs
@@ -48,7 +48,7 @@ private async Task InitializeAsync()
         }
     }
 
-    public async Task<T?> ReadSettingAsync<T>(string key)
+    public async Task<T?> ReadSettingAsync<T>(string key, T? defaultValue = default)
     {
         if (RuntimeHelper.IsMSIX)
         {
@@ -67,7 +67,7 @@ private async Task InitializeAsync()
             }
         }
 
-        return default;
+        return defaultValue;
     }
 
     public async Task SaveSettingAsync<T>(string key, T value)