rename SGVirtualHandTrackingSettings to SGVirtualHandSettings

Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp

@@ -41,7 +41,6 @@ FSGTrackingSettings::FSGTrackingSettings()
         FSGGloveTrackingSettings{},
         FSGHandTrackingSettings{},
         FSGHMDTrackingSettings{},
-        FSGVirtualHandTrackingSettings{},
         FSGWristTrackingSettings{})
 {
 }
@@ -51,13 +50,11 @@ FSGTrackingSettings::FSGTrackingSettings(
     const FSGGloveTrackingSettings& InGloveTrackingSettings,
     const FSGHandTrackingSettings& InHandTrackingSettings,
     const FSGHMDTrackingSettings& InHmdTrackingSettings,
-    const FSGVirtualHandTrackingSettings& InVirtualHandTrackingSettings,
     const FSGWristTrackingSettings& InWristTrackingSettings)
     : bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected),
       GloveTrackingSettings(InGloveTrackingSettings),
       HandTrackingSettings(InHandTrackingSettings),
       HMDTrackingSettings(InHmdTrackingSettings),
-      VirtualHandTrackingSettings(InVirtualHandTrackingSettings),
       WristTrackingSettings(InWristTrackingSettings)
 {
 }

Source/SenseGloveSettings/Private/SGSettings/SGVirtualHandSettings.cpp

@@ -33,12 +33,12 @@
  */
 
 
-#include "SGSettings/SGVirtualHandTrackingSettings.h"
+#include "SGSettings/SGVirtualHandSettings.h"
 
 #include "Engine/SkeletalMesh.h"
 
-FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings()
-    : FSGVirtualHandTrackingSettings(
+FSGVirtualHandSettings::FSGVirtualHandSettings()
+    : FSGVirtualHandSettings(
         nullptr,
         nullptr,
         2.4f,
@@ -50,7 +50,7 @@ FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings()
 {
 }
 
-FSGVirtualHandTrackingSettings::FSGVirtualHandTrackingSettings(
+FSGVirtualHandSettings::FSGVirtualHandSettings(
     const TSoftObjectPtr<USkeletalMesh>& InLeftHandReferenceMesh,
     const TSoftObjectPtr<USkeletalMesh>& InRightHandReferenceMesh,
     const float InThumbDistalPhalanxLength,

Source/SenseGloveSettings/Public/SGSettings/SGSettings.h

@@ -42,6 +42,7 @@
 #include "SGSettings/SGGameUserSettingSettings.h"
 #include "SGSettings/SGInitializationSettings.h"
 #include "SGSettings/SGTrackingSettings.h"
+#include "SGSettings/SGVirtualHandSettings.h"
 
 #include "SGSettings.generated.h"
 
@@ -77,6 +78,9 @@ private:
     UPROPERTY(Config, EditDefaultsOnly, Category = "SenseGlove")
     FSGTrackingSettings TrackingSettings;
 
+    UPROPERTY(Config, EditDefaultsOnly, Category="SenseGlove")
+    FSGVirtualHandSettings VirtualHandSettings;
+
 private:
     USGSettings();
 
@@ -111,6 +115,16 @@ public:
         TrackingSettings = InTrackingSettings;
     }
 
+    FORCEINLINE const FSGVirtualHandSettings& GetVirtualHandSettings() const
+    {
+        return VirtualHandSettings;
+    }
+
+    void SetVirtualHandSettings(const FSGVirtualHandSettings& InVirtualHandSettings)
+    {
+        VirtualHandSettings = InVirtualHandSettings;
+    }
+
 public:
     virtual bool ShouldCreateSubsystem(UObject* Outer) const override;
 

Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h

@@ -40,7 +40,6 @@
 #include "SGSettings/SGGloveTrackingSettings.h"
 #include "SGSettings/SGHandTrackingSettings.h"
 #include "SGSettings/SGHMDTrackingSettings.h"
-#include "SGSettings/SGVirtualHandTrackingSettings.h"
 #include "SGSettings/SGWristTrackingSettings.h"
 
 #include "SGTrackingSettings.generated.h"
@@ -71,9 +70,6 @@ public:
     UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
     FSGHMDTrackingSettings HMDTrackingSettings;
 
-    UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
-    FSGVirtualHandTrackingSettings VirtualHandTrackingSettings;
-
     UPROPERTY(Config, EditDefaultsOnly, Category="Tracking")
     FSGWristTrackingSettings WristTrackingSettings;
 
@@ -85,6 +81,5 @@ public:
         const FSGGloveTrackingSettings& InGloveTrackingSettings,
         const FSGHandTrackingSettings& InHandTrackingSettings,
         const FSGHMDTrackingSettings& InHmdTrackingSettings,
-        const FSGVirtualHandTrackingSettings& InVirtualHandTrackingSettings,
         const FSGWristTrackingSettings& InWristTrackingSettings);
 };

Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettings.h

@@ -38,15 +38,15 @@
 #include "UObject/ObjectMacros.h"
 #include "UObject/SoftObjectPtr.h"
 
-#include "SGVirtualHandTrackingSettings.generated.h"
+#include "SGVirtualHandSettings.generated.h"
 
 class USkeletalMesh;
 
 /**
-* Implements the hand tracking settings for the SenseGlove Tracking module.
+* Implements the hand tracking settings for the SenseGlove  module.
 */
 USTRUCT(BlueprintType)
-struct SENSEGLOVESETTINGS_API FSGVirtualHandTrackingSettings
+struct SENSEGLOVESETTINGS_API FSGVirtualHandSettings
 {
     GENERATED_USTRUCT_BODY()
 
@@ -88,9 +88,9 @@ public:
     TArray<FName> RightHandBoneNames;
 
 public:
-    FSGVirtualHandTrackingSettings();
+    FSGVirtualHandSettings();
 
-    FSGVirtualHandTrackingSettings(
+    FSGVirtualHandSettings(
         const TSoftObjectPtr<USkeletalMesh>& InLeftHandReferenceMesh,
         const TSoftObjectPtr<USkeletalMesh>& InRightHandReferenceMesh,
         float InThumbDistalPhalanxLength,