Revert "move bFallbackToHandTrackingIfNoGloveDetected from tracking settings to glove tracking settings"

This reverts commit e16c1d216f.

Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp

@@ -37,16 +37,13 @@
 
 FSGGloveTrackingSettings::FSGGloveTrackingSettings()
     : FSGGloveTrackingSettings{
-        1000.0f / 60.0f,
+        1000.0f / 60.0f
-        false
     }
 {
 }
 
 FSGGloveTrackingSettings::FSGGloveTrackingSettings(
-    const float InGloveConnectivityCheckInterval,
+    const float InGloveConnectivityCheckInterval)
-    const bool bInFallbackToHandTrackingIfNoGloveDetected)
+    : GloveConnectivityCheckInterval(InGloveConnectivityCheckInterval)
-    : GloveConnectivityCheckInterval(InGloveConnectivityCheckInterval),
-      bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected)
 {
 }

Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp

@@ -37,6 +37,7 @@
 
 FSGTrackingSettings::FSGTrackingSettings()
     : FSGTrackingSettings{
+        false,
         FSGGloveTrackingSettings{},
         FSGHandTrackingSettings{},
         FSGHMDTrackingSettings{},
@@ -46,11 +47,13 @@ FSGTrackingSettings::FSGTrackingSettings()
 }
 
 FSGTrackingSettings::FSGTrackingSettings(
+    const bool bInFallbackToHandTrackingIfNoGloveDetected,
     const FSGGloveTrackingSettings& InGloveTrackingSettings,
     const FSGHandTrackingSettings& InHandTrackingSettings,
     const FSGHMDTrackingSettings& InHmdTrackingSettings,
     const FSGWristTrackingSettings& InWristTrackingSettings)
-    : GloveTrackingSettings(InGloveTrackingSettings),
+    : bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected),
+      GloveTrackingSettings(InGloveTrackingSettings),
       HandTrackingSettings(InHandTrackingSettings),
       HMDTrackingSettings(InHmdTrackingSettings),
       WristTrackingSettings(InWristTrackingSettings)

Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h

@@ -54,17 +54,9 @@ public:
     UPROPERTY(Config, EditDefaultsOnly, Category="Glove Tracking")
     float GloveConnectivityCheckInterval;
 
-    /**
-     * If false, only a real glove will be tracked, otherwise will fall back to hand tracking if available and
-     * supported by the HMD device.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
-    bool bFallbackToHandTrackingIfNoGloveDetected;
-
 public:
     FSGGloveTrackingSettings();
 
     explicit FSGGloveTrackingSettings(
-        float InGloveConnectivityCheckInterval,
+        float InGloveConnectivityCheckInterval);
-        bool bInFallbackToHandTrackingIfNoGloveDetected);
 };

Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h

@@ -54,6 +54,13 @@ struct SENSEGLOVESETTINGS_API FSGTrackingSettings
     GENERATED_USTRUCT_BODY()
 
 public:
+    /**
+     * If false, only a real glove will be tracked, otherwise will fall back to hand tracking if available and
+     * supported by the HMD device.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
+    bool bFallbackToHandTrackingIfNoGloveDetected;
+
     UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
     FSGGloveTrackingSettings GloveTrackingSettings;
 
@@ -71,6 +78,7 @@ public:
     FSGTrackingSettings();
 
     FSGTrackingSettings(
+        bool bInFallbackToHandTrackingIfNoGloveDetected,
         const FSGGloveTrackingSettings& InGloveTrackingSettings,
         const FSGHandTrackingSettings& InHandTrackingSettings,
         const FSGHMDTrackingSettings& InHmdTrackingSettings,

Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp

@@ -106,7 +106,7 @@ struct FSGXRTracker::FImpl
         const USGSettings* Settings{USGSettings::GetInstance()};
         ensureAlwaysMsgf(Settings, TEXT("The settings subsystem has not been initialized!"));
         const bool bFallbackToHandTrackingIfNoGloveDetected =
-            Settings->GetTrackingSettings().GloveTrackingSettings.bFallbackToHandTrackingIfNoGloveDetected;
+            Settings->GetTrackingSettings().bFallbackToHandTrackingIfNoGloveDetected;
         return bFallbackToHandTrackingIfNoGloveDetected;
     }