bump the plugin version to v1.5.3

system where the virtual hand and the wrist tracker debug gizmos where
always drawn, regardless of chosen settings

CHANGELOG.md

@@ -5,20 +5,95 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [v1.4.1] - 2023-05-29
+## [1.5.3] - 2023-07-19
 
-This is a bugfix release with focus Android build issues.
+This is a hotfix release mostly addressing Android Bluetooth performance issues.
 
 ### Fixed
 
-- Fix an android gradle build issue which happens when the games package name won't start with com.senseglove.*.
-- Supress a grade warning for non-arm64 archs when the build target is android.
+- Minor changelog fixes.
+
+### Changed
+
+- SenseGlove libraries have been updated to v2.10.1-3b0e7c9.
+
+## [1.5.2] - 2023-07-19
+
+This is a hotfix release mostly addressing Android-related issues.
+
+### Fixed
+
+- Fix a build issue with Android shipping builds due to sgconnect.jar not getting copied automatically in the AFSProject which is compiled for shipping builds when AndroidFileServer (AFS) is enabled.
+- Minor changelog fixes and some source code formatting fixes.
+
+## [1.5.1] - 2023-07-13
+
+This is a hotfix release addressing a few critical issues introduced by the recent changes.
+
+### Fixed
+
+- Fix a wrist tracker bug where left and right hands' wrist trackers are mistakenly tracking the opposite hand's motion source.
+- Fix a bug where the right hand is not able to do grab or release.
+
+## [1.5.0] - 2023-06-16
+
+This release breaks ABI/API compatibility with the previous versions in some areas as documented below.
+
+### Added
+
+- Added HTC VIVE Focus 3 positional tracking hardware enum.
+- Added support for the Meta Quest Pro, HTC VIVE, and HTC VIVE Focus 3 positional tracking hardware.
+- Added two options to the wrist tracker settings (to the global plugin settings and the overrides in the wrist tracker component) in order to be able to specify a custom motion source for the left and right hands, so that it allows SteamVR-based trackers such as HTC VIVE or HTC VIVE Focus 3 to operate with the SGPawn.
+
+### Fixed
+
+- Fix a bug where SteamVR trackers such as HTC VIVE and HTC VIVE Focus 3's wrist orientation and location were not being tracked.
+
+### Changed
+
+- Fully refactored the top-level configurations in the settings system into USTRUCTs.
+- SenseGlove libraries have been updated to v2.10.0-12133ac.
 
 ### Removed
 
-- Remove dead gradle code from the android module.
+- Dropped support for the Epic Native Toolchain v19, MSVC v141 (Visual Studio 2017), and thus Unreal Engine 4.27 as it has been marked as deprecated since v1.4.x.
+- Removed any kind of support for Oculus Touch (Oculus Rift S and Oculus Quest 1) positional tracking hardware, thus the enum as well.
+- Removed any kind of support for Pico Neo 2 positional tracking hardware, thus the enum as well.
+- Removed any kind of support for Pico Neo 3 positional tracking hardware, thus the enum as well.
 
-## [v1.4.0] - 2023-05-19
+## [1.4.3] - 2023-06-01
+
+This is a hotfix release addressing a critical Android crash.
+
+### Fixed
+
+- Fix a critical Android crash that happens where the default development hand meshes are not found, which means almost always since we don't ship any default virtual hand mesh at the moment.
+- Minor changelog release formatting fix in order to stay consistent.
+
+## [1.4.2] - 2023-06-01
+
+This is a hotfix release addressing a few critical issues.
+
+### Fixed
+
+- Fix build issues with certain compilers when the Unreal Engine version is older than 5.2.
+- Reintroduced the Virtual Hand and the Wrist Tracker debug gizmos which have temporarily been disabled due to a bug in the settings system.
+- Some minor changelog fixes.
+
+## [1.4.1] - 2023-05-29
+
+This is a bugfix release with a focus on Android build issues.
+
+### Fixed
+
+- Fix an Android Gradle build issue that happens when the game's package name won't start with com.senseglove.*.
+- Suppress a grade warning for non-arm64 architectures when the build target is Android.
+
+### Removed
+
+- Remove dead Gradle code from the Android module.
+
+## [1.4.0] - 2023-05-19
 
 This release breaks ABI/API compatibility with the previous versions.
 
@@ -27,7 +102,7 @@ This release breaks ABI/API compatibility with the previous versions.
 - Added support for the stable release of Unreal Engine 5.2 (the preview release has been supported since v1.2.0).
 - Added Linux AArch64 platform support.
 - Added a new Grab component that can turn any actor into a grabbable object.
-- Added a new Touch component that enables haptic feedbacks such as Buzz and Force-Feedback commands.
+- Added a new Touch component that enables haptic feedback such as Buzz and Force-Feedback commands.
 - Added an optional feature in order to automatically stop all haptics on the EndPlay event, wherever the virtual hand component is used. By default, it's enabled.
 
 ### Fixed
@@ -37,7 +112,7 @@ This release breaks ABI/API compatibility with the previous versions.
 ### Changed
 
 - SenseGlove libraries have been updated to v2.7.1-965f90c with support for Linux AArch64.
-- The Virtual Hand and the Wrist Tracker debug Gizmos (the intended use is only for SenseGlove developers for really low-level stuff; thus won't affect the users of the plugin at all) have been disabled and will be ignored due to an esoteric bug in the settings systems which has been scheduled to be fixed in the future releases.
+- The Virtual Hand and the Wrist Tracker debug gizmos (the intended use is only for SenseGlove developers for really low-level stuff; thus won't affect the users of the plugin at all) have been disabled and will be ignored due to an esoteric bug in the settings systems which has been scheduled to be fixed in the future releases.
 
 ### Removed
 
@@ -45,16 +120,16 @@ This release breaks ABI/API compatibility with the previous versions.
 
 ### Deprecated
 
-- This is the last release to support Unreal Engine 4.27 and please keep in mind that the current release is not obtainable through the Unreal Engine Markplace. The latest published version on the Marketplace for 4.27 is v1.3.1. Per Epic's Marketplace policy regarding Code Plugins, we are only able to distribute or update the SenseGlove plugin for the last 3 stable versions of Unreal Engine. As a result, we won't be able to publish updates or bug fixes for the older versions of the Engine except on rare occasions and only through our official repository on Microsoft Azure DevOps.
+- This is the last release to support Unreal Engine 4.27 and please keep in mind that the current release is not obtainable through the Unreal Engine Marketplace. The latest published version on the Marketplace for 4.27 is v1.3.1. Per Epic's Marketplace policy regarding Code Plugins, we are only able to distribute or update the SenseGlove plugin for the last 3 stable versions of Unreal Engine. As a result, we won't be able to publish updates or bug fixes for the older versions of the Engine except on rare occasions and only through our official repository on Microsoft Azure DevOps.
 
-## [v1.3.1] - 2023-04-28
+## [1.3.1] - 2023-04-28
 
 ### Fixed
 
 - Fix RunUAT build issues caused by missing headers.
 - Minor documentation fixes.
 
-## [v1.3.0] - 2023-04-28
+## [1.3.0] - 2023-04-28
 
 This release breaks ABI/API compatibility with the previous versions in addition to breaking coordinates systems conversions between Unreal Engine and the SenseGlove libraries.
 
@@ -65,7 +140,7 @@ This release breaks ABI/API compatibility with the previous versions in addition
 
 ### Fixed
 
-- Fix the wrist tracker miscalculations for the Quest 2 controllers (other headsets might needs fixing as well, in that case future releases will address that).
+- Fix the wrist tracker miscalculations for the Quest 2 controllers (other headsets might need fixing as well, in that case, future releases will address that).
 - Minor code improvement and fixes.
 - Minor documentation fixes.
 
@@ -75,13 +150,13 @@ This release breaks ABI/API compatibility with the previous versions in addition
 - Breaking changes in the SenseGlove/Unreal coordinates systems conversions due to underlying changes in the SenseGlove Core Libraries.
 - SenseGlove libraries have been updated to v2.6.0-aac3d56.
 
-## [v1.2.1] - 2023-03-30
+## [1.2.1] - 2023-03-30
 
 ### Fixed
 
 - Fix RunUAT build issues with Android.
 
-## [v1.2.0] - 2023-03-28
+## [1.2.0] - 2023-03-28
 
 This release breaks ABI/API compatibility with the previous versions.
 
@@ -105,7 +180,7 @@ This release breaks ABI/API compatibility with the previous versions.
 
 ### Removed
 
-- Removed a few thousands lines of archaic pre-public-release dead code.
+- Removed a few thousand lines of archaic pre-public-release dead code.
 - Dropped Android NDK r21b binaries used by the older engine versions.
 - Purged the dead code for dropped engine versions by v1.1.1 (4.22, 4.23, 4.24, 4.25, and 4.26) that carried over to the current version.
 - Removed redundant SGConnectImpl/SGPlatform.
@@ -137,7 +212,7 @@ This release breaks ABI/API compatibility with the previous versions.
 
 - Whitelist Android as a target platform.
 - Introduce Android support.
-- Add third-pary library SGConnect for Android v1.1.0.
+- Add third-party library SGConnect for Android v1.1.0.
 
 ### Fixed
 
@@ -179,7 +254,7 @@ This is a minor release focusing on adherence to the Unreal Engine Marketplace G
 ### Added
 
 - Added the newly acquired Unreal Engine Market Place Offer ID to the .uplugin file.
-- List the dot files inside FilterPlugin.ini file as well.
+- List the dotfiles inside the FilterPlugin.ini file as well.
 - Add the copyright notice to the source files missing it.
 - Add the SenseGlove SDK license to the third-party license file.
 

README.md

@@ -13,10 +13,10 @@ This repository relies on Git LFS for storing binary blobs (e.g. third-party lib
 | **4.24** |         ⚠️ v1.0.x        |         ⚠️ v1.0.x        |            ❌            |               ⚠️ v1.0.x              |                   ❌                  |         ❌         |              ❌             |         ⚠️ v1.0.4         |
 | **4.25** |         ⚠️ v1.0.x        |         ⚠️ v1.0.x        |            ❌            |               ⚠️ v1.0.x              |                   ❌                  |         ❌         |              ❌             |         ⚠️ v1.0.4         |
 | **4.26** |         ⚠️ v1.0.x        |         ⚠️ v1.0.x        |            ❌            |               ⚠️ v1.0.x              |                   ❌                  |         ❌         |              ❌             |         ⚠️ v1.0.4         |
-| **4.27** |         ✅ v1.4.x        |         ✅ v1.4.x        |         ✅ v1.4.x        |               ✅ v1.4.x              |               ✅ v1.4.x               |  ✅ v1.4.x (r21e)  |          ⚠️ v1.3.1          |         ✅ v1.4.1         |
-| **5.0**  |            ❌            |         ✅ v1.4.x        |         ✅ v1.4.x        |               ✅ v1.4.x              |               ✅ v1.4.x               |  ✅ v1.4.x (r21e)  |          ✅ v1.4.1          |         ✅ v1.4.1         |
-| **5.1**  |            ❌            |         ✅ v1.4.x        |         ✅ v1.4.x        |               ✅ v1.4.x              |               ✅ v1.4.x               |  ✅ v1.4.x (r25b)  |          ✅ v1.4.1          |         ✅ v1.4.1         |
-| **5.2**  |            ❌            |         ✅ v1.4.x        |         ✅ v1.4.x        |               ✅ v1.4.x              |               ✅ v1.4.x               |  ✅ v1.4.x (r25b)  |          ✅ v1.4.1          |         ✅ v1.4.1         |
+| **4.27** |         ⚠️ v1.4.x        |         ⚠️ v1.4.x        |         ⚠️ v1.4.x        |               ⚠️ v1.4.x              |               ⚠️ v1.4.x               |  ⚠️ v1.4.x (r21e)  |          ⚠️ v1.3.1          |         ⚠️ v1.4.3         |
+| **5.0**  |            ❌            |         ✅ v1.5.x        |         ✅ v1.5.x        |               ✅ v1.5.x              |               ✅ v1.5.x               |  ✅ v1.5.x (r21e)  |          ✅ v1.5.3          |         ✅ v1.5.0         |
+| **5.1**  |            ❌            |         ✅ v1.5.x        |         ✅ v1.5.x        |               ✅ v1.5.x              |               ✅ v1.5.x               |  ✅ v1.5.x (r25b)  |          ✅ v1.5.3          |         ✅ v1.5.0         |
+| **5.2**  |            ❌            |         ✅ v1.5.x        |         ✅ v1.5.x        |               ✅ v1.5.x              |               ✅ v1.5.x               |  ✅ v1.5.x (r25b)  |          ✅ v1.5.3          |         ✅ v1.5.0         |
 
 * <code>✅</code> Supported
 * <code>⚠️</code> Not supported by the latest release and might be lacking features

SenseGlove.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "1.4.1",
+	"VersionName": "1.5.3",
 	"FriendlyName": "SenseGlove",
 	"Description": "Integrating the SenseGlove haptic controller into Unreal Engine",
 	"Category": "Virtual Reality",

Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp

@@ -114,6 +114,7 @@ struct USGVirtualHandComponent::FImpl
     bool IsEditor() const;
 
     FString GetDefaultMeshPath() const;
+    bool IsUsingDefaultMesh() const;
     bool IsUsingUserMesh() const;
     USkeletalMesh* LoadDefaultMesh() const;
     void SetDefaultMesh() const;
@@ -209,6 +210,7 @@ USGVirtualHandComponent::USGVirtualHandComponent(const FObjectInitializer& Objec
     Super::SetAnimClass(USGVirtualHandAnimInstance::StaticClass());
 
     bRight = true;
+    bHiddenInGameIfNoGloveDetected = false;
 
     bAutoStopAllHapticsOnEndPlay = true;
 
@@ -228,9 +230,8 @@ USGVirtualHandComponent::USGVirtualHandComponent(const FObjectInitializer& Objec
     RingFingertipTouchSocketName = FName{TEXT("TouchRingFingertip")};
     PinkyFingertipTouchSocketName = FName{TEXT("TouchPinkyFingertip")};
 
-    bHiddenInGameIfNoGloveDetected = false;
-
     DebugVirtualHandSettings = FSGDebugVirtualHandSettings{
+        false,
         ESGDebugVirtualHandDrawingMode::None,
         FVector(0.5f, 0.5f, 0.5f),
         FColor(255, 0, 0, 255),
@@ -514,6 +515,30 @@ FString USGVirtualHandComponent::FImpl::GetDefaultMeshPath() const
     return MoveTemp(SkeletalMeshPath);
 }
 
+bool USGVirtualHandComponent::FImpl::IsUsingDefaultMesh() const
+{
+    const USkeletalMesh* CurrentMesh{GetMesh()};
+    if (!IsValid(CurrentMesh))
+    {
+        return false;
+    }
+
+    const FString CurrentMeshPath(CurrentMesh->GetPathName());
+    const FString LeftHandDefaultMeshPath(GetDefaultLeftHandMeshPath());
+    const FString LeftHandDefaultMeshPathOnly(GetDefaultLeftHandMeshPathOnly());
+    const FString RightHandDefaultMeshPath(GetDefaultRightHandMeshPath());
+    const FString RightHandDefaultMeshPathOnly(GetDefaultRightHandMeshPathOnly());
+    if (CurrentMeshPath == LeftHandDefaultMeshPath
+        || CurrentMeshPath == LeftHandDefaultMeshPathOnly
+        || CurrentMeshPath == RightHandDefaultMeshPath
+        || CurrentMeshPath == RightHandDefaultMeshPathOnly)
+    {
+        return true;
+    }
+
+    return false;
+}
+
 bool USGVirtualHandComponent::FImpl::IsUsingUserMesh() const
 {
     const USkeletalMesh* CurrentMesh{GetMesh()};
@@ -555,7 +580,14 @@ USkeletalMesh* USGVirtualHandComponent::FImpl::LoadDefaultMesh() const
 
 void USGVirtualHandComponent::FImpl::SetDefaultMesh() const
 {
-    Owner->SetSkeletalMesh(LoadDefaultMesh(), true);
+    // FIXME
+    // Since we dont ship a default virtual hand mesh at the moment, calling SetDefaultMesh causes the following failed
+    // assertion due the fact that the engine won't be able to find the asset at the default location:
+    // Assertion failed: IsInGameThread()
+    // Unable to load /SenseGlove/Meshes/SK_SenseGlove_VirtualHand_*. Objects and Packages can only be loaded from the
+    // One workaround would be disabling the async loading or as an alternative simply disabling this portion of the
+    // code should be a good-enough fix until we address this issue in it's own time.
+    //Owner->SetSkeletalMesh(LoadDefaultMesh(), true);
 }
 
 USkeletalMesh* USGVirtualHandComponent::FImpl::GetMesh() const
@@ -752,11 +784,8 @@ void USGVirtualHandComponent::FImpl::DrawDebugVirtualHand() const
     const TArray<TArray<FVector>>& JointPositions{HandPose->GetJointPositions()};
     const TArray<TArray<FRotator>>& JointRotations{HandPose->GetJointRotations()};
 
-    /// FIXME
-    /// We temporarily ignore the debug settings, as for an esoteric reason it always produces conditions,
-    /// in which the debug gizmo will be drawn!
-    //FSGDebugVirtualHand::Draw(World, WristLocation, WristRotation, JointPositions, JointRotations,
-    //                          Owner->DebugVirtualHandSettings);
+    FSGDebugVirtualHand::Draw(World, WristLocation, WristRotation, JointPositions, JointRotations,
+                              Owner->DebugVirtualHandSettings);
 }
 
 void USGVirtualHandComponent::FImplDeleter::operator()(const FImpl* P) const

Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp

@@ -84,6 +84,7 @@ struct USGWristTrackerComponent::FImpl
     bool UninitializeBackend() const;
     bool CheckGlove() const;
 
+    void UpdateMotionSource() const;
     void UpdateWristTrackingData() const;
     void DrawDebugGizmo();
 };
@@ -106,24 +107,26 @@ USGWristTrackerComponent::USGWristTrackerComponent(const FObjectInitializer& Obj
     SetReceivesDecals(false);
     SetCanEverAffectNavigation(false);
 
-    SetRight(true);
-
     bOverridePluginWristTrackingSettings = false;
-    bDrawWristTrackerDebugGizmo = false;
-    TrackingHardware = ESGPositionalTrackingHardware::None;
-    TrackingHardwareLocationOffset = FVector::ZeroVector;
-    TrackingHardwareLocationOffset = FVector::ZeroVector;
-
-    bOverridePluginWristTrackingDebugSettings = false;
-    bDrawWristTrackerDebugGizmo = false;
-    WristTrackerDebugGizmoSettings = FSGDebugGizmoSettings(
-        4.0f, 1.0f,
-        FColor(255, 0, 0, 255),
-        FColor(0, 255, 0, 255),
-        FColor(0, 0, 255, 255),
-        false, 1.1f, 0
+    WristTrackingSettings = FSGWristTrackingSettings(
+        ESGPositionalTrackingHardware::None,
+        FVector::ZeroVector,
+        FVector::ZeroVector,
+        FRotator::ZeroRotator,
+        FRotator::ZeroRotator,
+        EControllerHand::Left,
+        EControllerHand::Right,
+        false,
+        FSGDebugGizmoSettings(
+            4.0f, 1.0f,
+            FColor(255, 0, 0, 255),
+            FColor(0, 255, 0, 255),
+            FColor(0, 0, 255, 255),
+            false, 1.1f, 0
+            )
         );
-    bDrawWristTrackerDebugGizmo = false;
+
+    bRight = true;
 
     bBackendInitialized = false;
     Glove = nullptr;
@@ -131,140 +134,35 @@ USGWristTrackerComponent::USGWristTrackerComponent(const FObjectInitializer& Obj
     WristRotation = FRotator::ZeroRotator;
 }
 
-void USGWristTrackerComponent::SetRight(const bool bRight)
+void USGWristTrackerComponent::SetRight(const bool bInRight)
 {
-    SetTrackingSource(bRight ? EControllerHand::Right : EControllerHand::Left);
+    bRight = bInRight;
+    Pimpl->UpdateMotionSource();
 }
 
-ESGPositionalTrackingHardware USGWristTrackerComponent::GetTrackingHardware() const
+const FSGWristTrackingSettings& USGWristTrackerComponent::GetWristTrackingSettings() const
 {
     if (OverridesPluginWristTrackingSettings())
     {
-        return TrackingHardware;
+        return WristTrackingSettings;
     }
 
-    return USGSettings::GetInstance()->GetTrackingHardware();
+    const USGSettings* Settings{USGSettings::GetInstance()};
+    if (!ensureAlwaysMsgf(Settings, TEXT("The settings subsystem has not been initialized!")))
+    {
+        return WristTrackingSettings;
+    }
+
+    return Settings->GetWristTrackingSettings();
 }
 
-void USGWristTrackerComponent::SetTrackingHardware(const ESGPositionalTrackingHardware InTrackingHardware)
+void USGWristTrackerComponent::SetWristTrackingSettings(const FSGWristTrackingSettings& InWristTrackingSettings)
 {
     ensureAlwaysMsgf(
         OverridesPluginWristTrackingSettings(),
-        TEXT( "Setting TrackingHardware is only permitted when bOverridePluginWristTrackingSettings is enabled!"));
+        TEXT( "Setting WristTrackingSettings is only permitted when bOverridePluginWristTrackingSettings is enabled!"));
 
-    TrackingHardware = InTrackingHardware;
-}
-
-const FVector& USGWristTrackerComponent::GetTrackingHardwareLocationOffset() const
-{
-    ensureAlwaysMsgf(
-        GetTrackingHardware() == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Getting TrackingHardwareLocationOffset is only permitted when TrackingHardware is set to Custom!"));
-
-    if (OverridesPluginWristTrackingSettings())
-    {
-        return TrackingHardwareLocationOffset;
-    }
-
-    return IsRight()
-        ? USGSettings::GetInstance()->GetTrackingHardwareLocationOffsetRightHand()
-        : USGSettings::GetInstance()->GetTrackingHardwareLocationOffsetLeftHand();
-}
-
-void USGWristTrackerComponent::SetTrackingHardwareLocationOffset(const FVector& InTrackingHardwareLocationOffset)
-{
-    ensureAlwaysMsgf(
-        OverridesPluginWristTrackingSettings(),
-        TEXT(
-            "Setting TrackingHardwareLocationOffset is only permitted when bOverridePluginWristTrackingSettings is enabled!"
-        ));
-
-    ensureAlwaysMsgf(
-        GetTrackingHardware() == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Setting TrackingHardwareLocationOffset is only permitted when TrackingHardware is set to Custom!"));
-
-    TrackingHardwareLocationOffset = InTrackingHardwareLocationOffset;
-}
-
-const FRotator& USGWristTrackerComponent::GetTrackingHardwareRotationOffset() const
-{
-    ensureAlwaysMsgf(
-        GetTrackingHardware() == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Getting TrackingHardwareRotationOffset is only permitted when TrackingHardware is set to Custom!"));
-
-    if (OverridesPluginWristTrackingSettings())
-    {
-        return TrackingHardwareRotationOffset;
-    }
-
-    return IsRight()
-        ? USGSettings::GetInstance()->GetTrackingHardwareRotationOffsetRightHand()
-        : USGSettings::GetInstance()->GetTrackingHardwareRotationOffsetLeftHand();
-}
-
-void USGWristTrackerComponent::SetTrackingHardwareRotationOffset(const FRotator& InTrackingHardwareRotationOffset)
-{
-    ensureAlwaysMsgf(
-        OverridesPluginWristTrackingSettings(),
-        TEXT(
-            "Setting TrackingHardwareRotationOffset is only permitted when bOverridePluginWristTrackingSettings is enabled!"
-        ));
-
-    ensureAlwaysMsgf(
-        GetTrackingHardware() == ESGPositionalTrackingHardware::Custom,
-        TEXT("Setting TrackingHardwareRotationOffsetRightHand is only permitted when TrackingHardware is set to Custom!"
-        ));
-
-    TrackingHardwareRotationOffset = InTrackingHardwareRotationOffset;
-}
-
-bool USGWristTrackerComponent::GetDrawWristTrackerDebugGizmo() const
-{
-    if (OverridesPluginWristTrackingDebugSettings())
-    {
-        return !!bDrawWristTrackerDebugGizmo;
-    }
-
-    return USGSettings::GetInstance()->GetDrawWristTrackerDebugGizmo();
-}
-
-void USGWristTrackerComponent::SetDrawWristTrackerDebugGizmo(const bool bInDrawWristTrackerDebugGizmo)
-{
-    ensureAlwaysMsgf(
-        OverridesPluginWristTrackingDebugSettings(),
-        TEXT( "Setting bDrawWristTrackerDebugGizmo is only permitted when bOverridePluginWristTrackingDebugSettings is"
-            " enabled!"));
-
-    bDrawWristTrackerDebugGizmo = bInDrawWristTrackerDebugGizmo;
-}
-
-const FSGDebugGizmoSettings& USGWristTrackerComponent::GetWristTrackerDebugGizmoSettings() const
-{
-    ensureAlwaysMsgf(
-        GetDrawWristTrackerDebugGizmo(),
-        TEXT("Getting WristTrackerDebugGizmoLength is only permitted when bDrawWristTrackerDebugGizmo is enabled!"));
-
-    if (OverridesPluginWristTrackingDebugSettings())
-    {
-        return WristTrackerDebugGizmoSettings;
-    }
-
-    return USGSettings::GetInstance()->GetWristTrackerDebugGizmoSettings();
-}
-
-void USGWristTrackerComponent::SetWristTrackerDebugGizmoSettings(
-    const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings)
-{
-    ensureAlwaysMsgf(
-        OverridesPluginWristTrackingDebugSettings(),
-        TEXT("Setting WristTrackerDebugGizmoLength is only permitted when bOverridePluginWristTrackingDebugSettings is"
-            " enabled!"));
-
-    ensureAlwaysMsgf(
-        GetDrawWristTrackerDebugGizmo(),
-        TEXT("Setting WristTrackerDebugGizmoLength is only permitted when bDrawWristTrackerDebugGizmo is enabled!"));
-
-    WristTrackerDebugGizmoSettings = InWristTrackerDebugGizmoSettings;
+    WristTrackingSettings = InWristTrackingSettings;
 }
 
 #if WITH_EDITOR
@@ -290,6 +188,8 @@ void USGWristTrackerComponent::InitializeComponent()
     {
         (void) Pimpl->CheckGlove();
     }
+
+    Pimpl->UpdateMotionSource();
 }
 
 void USGWristTrackerComponent::UninitializeComponent()
@@ -307,6 +207,8 @@ void USGWristTrackerComponent::BeginPlay()
     {
         (void) Pimpl->CheckGlove();
     }
+
+    Pimpl->UpdateMotionSource();
 }
 
 void USGWristTrackerComponent::EndPlay(const EEndPlayReason::Type EndPlayReason)
@@ -329,7 +231,7 @@ void USGWristTrackerComponent::TickComponent(
 
     Super::TickComponent(DeltaTime, TickType, ThisTickFunction);
 
-    if (GetDrawWristTrackerDebugGizmo())
+    if (!!WristTrackingSettings.bDrawWristTrackerDebugGizmo)
     {
         Pimpl->DrawDebugGizmo();
     }
@@ -480,6 +382,16 @@ bool USGWristTrackerComponent::FImpl::CheckGlove() const
     return bFoundGlove;
 }
 
+void USGWristTrackerComponent::FImpl::UpdateMotionSource() const
+{
+    if (GEngine)
+    {
+        Owner->SetTrackingSource(Owner->IsRight()
+            ? Owner->GetWristTrackingSettings().RightHandMotionSource
+            : Owner->GetWristTrackingSettings().LeftHandMotionSource);
+    }
+}
+
 void USGWristTrackerComponent::FImpl::UpdateWristTrackingData() const
 {
     ensureAlwaysMsgf(Owner->Glove, TEXT("Invalid Glove!"));
@@ -487,15 +399,23 @@ void USGWristTrackerComponent::FImpl::UpdateWristTrackingData() const
     FVector TrackerLocation{Owner->GetComponentLocation()};
     FRotator TrackerRotation{Owner->GetComponentRotation()};
 
-    ESGPositionalTrackingHardware TrackerHardware = Owner->GetTrackingHardware();
+    ESGPositionalTrackingHardware TrackerHardware = Owner->GetWristTrackingSettings().TrackingHardware;
     if (TrackerHardware == ESGPositionalTrackingHardware::None)
     {
         TrackerHardware = ESGPositionalTrackingHardware::Custom;
     }
     else if (TrackerHardware == ESGPositionalTrackingHardware::Custom)
     {
-        TrackerLocation += Owner->GetTrackingHardwareLocationOffset();
-        TrackerRotation += Owner->GetTrackingHardwareRotationOffset();
+        if (Owner->IsRight())
+        {
+            TrackerLocation += Owner->GetWristTrackingSettings().TrackingHardwareLocationOffsetRightHand;
+            TrackerRotation += Owner->GetWristTrackingSettings().TrackingHardwareRotationOffsetRightHand;
+        }
+        else
+        {
+            TrackerLocation += Owner->GetWristTrackingSettings().TrackingHardwareLocationOffsetLeftHand;
+            TrackerRotation += Owner->GetWristTrackingSettings().TrackingHardwareRotationOffsetLeftHand;
+        }
     }
 
     FVector NewWristLocation;
@@ -537,12 +457,9 @@ void USGWristTrackerComponent::FImpl::DrawDebugGizmo()
     const UWorld* World{Owner->GetWorld()};
     const FVector& Location{Owner->GetComponentLocation()};
     const FRotator& Rotation{Owner->GetComponentRotation()};
-    const FSGDebugGizmoSettings& DebugGizmoSettings{Owner->GetWristTrackerDebugGizmoSettings()};
+    const FSGDebugGizmoSettings& DebugGizmoSettings{Owner->GetWristTrackingSettings().WristTrackerDebugGizmoSettings};
 
-    /// FIXME
-    /// We temporarily ignore the debug settings, as for an esoteric reason it always produces conditions,
-    /// in which the debug gizmo will be drawn!
-    //FSGDebugGizmo::Draw(World, Location, Rotation, DebugGizmoSettings);
+    FSGDebugGizmo::Draw(World, Location, Rotation, DebugGizmoSettings);
 }
 
 void USGWristTrackerComponent::FImplDeleter::operator()(const FImpl* P) const

Source/SenseGlove/Private/SenseGlove/GameFramework/SGPawn.cpp

@@ -435,7 +435,7 @@ ASGPawn::ASGPawn(const FObjectInitializer& ObjectInitializer)
     LeftHandGrabState = FSGGrabState(HandLeft, nullptr, nullptr, nullptr, nullptr);
     LeftHandTouchState = FSGTouchState(HandLeft, nullptr, nullptr, nullptr, nullptr, nullptr);
 
-    RightHandGrabState = FSGGrabState(HandLeft, nullptr, nullptr, nullptr, nullptr);
+    RightHandGrabState = FSGGrabState(HandRight, nullptr, nullptr, nullptr, nullptr);
     RightHandTouchState = FSGTouchState(HandRight, nullptr, nullptr, nullptr, nullptr, nullptr);
 }
 
@@ -1141,15 +1141,41 @@ void ASGPawn::Grab(USGVirtualHandComponent* Hand, AActor* Actor)
         Pimpl->DisableActorPhysics(Actor);
     }
 
+#if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2
     const bool bAttached = Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName);
     if (bAttached)
     {
-        LeftHandGrabState.GrabbedActor = Actor;
+        if (Hand->IsRight())
+        {
+            RightHandGrabState.GrabbedActor = Actor;
+        }
+        else
+        {
+            LeftHandGrabState.GrabbedActor = Actor;
+        }
     }
     else
     {
-        SGLOG_ERROR("Failed to grab the actor with the left hand!", Actor, SocketName);
+        if (Hand->IsRight())
+        {
+            SGLOG_ERROR("Failed to grab the actor with the right hand!", Actor, SocketName);
+        }
+        else
+        {
+            SGLOG_ERROR("Failed to grab the actor with the left hand!", Actor, SocketName);
+        }
     }
+#else
+    Actor->AttachToComponent(Hand, MoveTemp(AttachmentRules), SocketName);
+    if (Hand->IsRight())
+    {
+        RightHandGrabState.GrabbedActor = Actor;
+    }
+    else
+    {
+        LeftHandGrabState.GrabbedActor = Actor;
+    }
+#endif  /* ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 2 */
 }
 
 void ASGPawn::ReleaseLeft()

Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h

@@ -84,6 +84,9 @@ private:
     UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
     uint8 bRight : 1;
 
+    UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
+    uint8 bHiddenInGameIfNoGloveDetected : 1;
+
     UPROPERTY(EditAnywhere, Category="SenseGlove | Haptics", meta=(AllowPrivateAccess="false"))
     uint8 bAutoStopAllHapticsOnEndPlay : 1;
 
@@ -121,10 +124,6 @@ private:
     FName PinkyFingertipTouchSocketName;
 
     UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
-    uint8 bHiddenInGameIfNoGloveDetected : 1;
-
-    UPROPERTY(EditAnywhere, Category="SenseGlove",
-        meta=(AllowPrivateAccess="false", EditCondition="bDrawDebugVirtualHand", EditConditionHides))
     FSGDebugVirtualHandSettings DebugVirtualHandSettings;
 
 private:
@@ -150,6 +149,16 @@ public:
 
     void SetRight(const bool bInRight);
 
+    FORCEINLINE const FName& GetMiddleFingertipTouchSocketName() const
+    {
+        return MiddleFingertipTouchSocketName;
+    }
+
+    FORCEINLINE void SetMiddleFingertipTouchSocketName(const FName& SocketName)
+    {
+        MiddleFingertipTouchSocketName = SocketName;
+    }
+
     FORCEINLINE bool AutoStopsAllHapticsOnEndPlay() const
     {
         return !!bAutoStopAllHapticsOnEndPlay;
@@ -157,7 +166,7 @@ public:
 
     FORCEINLINE void SetAutoStopAllHapticsOnEndPlay(const bool bInAutoStopAllHapticsOnEndPlay)
     {
-         bAutoStopAllHapticsOnEndPlay = bInAutoStopAllHapticsOnEndPlay;
+        bAutoStopAllHapticsOnEndPlay = bInAutoStopAllHapticsOnEndPlay;
     }
 
     FORCEINLINE const FName& GetGrabSocketName() const
@@ -225,16 +234,6 @@ public:
         IndexFingertipTouchSocketName = SocketName;
     }
 
-    FORCEINLINE const FName& GetMiddleFingertipTouchSocketName() const
-    {
-        return MiddleFingertipTouchSocketName;
-    }
-
-    FORCEINLINE void SetMiddleFingertipTouchSocketName(const FName& SocketName)
-    {
-        MiddleFingertipTouchSocketName = SocketName;
-    }
-
     FORCEINLINE const FName& GetRingFingertipTouchSocketName() const
     {
         return RingFingertipTouchSocketName;

Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h

@@ -41,7 +41,7 @@
 #include "MotionControllerComponent.h"
 #include "Templates/UniquePtr.h"
 
-#include "SGSettings/SGDebugGizmoSettings.h"
+#include "SGSettings/SGWristTrackingSettings.h"
 #include "SGTypes/SGCoreTypes.h"
 
 #include "SGWristTrackerComponent.generated.h"
@@ -94,51 +94,21 @@ private:
     FImplDeleter PimplDeleter;
 
 private:
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings")
+    UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false"))
+    uint8 bRight : 1;
+
+    /**
+     * Determines whether to override the plugin's wrist tracking settings or not.
+     */
+    UPROPERTY(EditAnywhere, Category = "SenseGlove", meta=(AllowPrivateAccess="false"))
     uint8 bOverridePluginWristTrackingSettings : 1;
 
     /**
-     * If set to Custom, any desired location and rotation can be specified.
+     * Overrides the plugin's wrist tracking settings.
      */
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings",
-        meta=(EditCondition="bOverridePluginWristTrackingSettings", EditConditionHides))
-    ESGPositionalTrackingHardware TrackingHardware;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings",
-        meta=(EditCondition=
-            "bOverridePluginWristTrackingSettings && TrackingHardware == ESGPositionalTrackingHardware::Custom",
-            EditConditionHides))
-    FVector TrackingHardwareLocationOffset;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings",
-        meta=(EditCondition=
-            "bOverridePluginWristTrackingSettings && TrackingHardware == ESGPositionalTrackingHardware::Custom",
-            EditConditionHides))
-    FRotator TrackingHardwareRotationOffset;
-
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings")
-    uint8 bOverridePluginWristTrackingDebugSettings : 1;
-
-    /**
-     * If enabled, draws debug Wrist trackers where possible.
-     */
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings",
-        meta=(EditCondition="bOverridePluginWristTrackingDebugSettings", EditConditionHides))
-    uint8 bDrawWristTrackerDebugGizmo : 1;
-
-    /**
-     * Valid only if bDrawWristTrackerDebugGizmo is enabled.
-     */
-    UPROPERTY(Config, EditAnywhere, Category = "Override Plugin Settings",
-        meta=(EditCondition="bOverridePluginWristTrackingDebugSettings && bDrawWristTrackerDebugGizmo",
-            EditConditionHides))
-    FSGDebugGizmoSettings WristTrackerDebugGizmoSettings;
+    UPROPERTY(EditAnywhere, Category = "SenseGlove",
+        meta=(AllowPrivateAccess="false", EditCondition="bOverridePluginWristTrackingSettings", EditConditionHides))
+    FSGWristTrackingSettings WristTrackingSettings;
 
 private:
     UPROPERTY(Transient)
@@ -154,6 +124,18 @@ private:
     FRotator WristRotation;
 
 public:
+    FORCEINLINE bool IsLeft() const
+    {
+        return !IsRight();
+    }
+
+    FORCEINLINE bool IsRight() const
+    {
+        return !!bRight;
+    }
+
+    void SetRight(const bool bInRight);
+
     FORCEINLINE bool OverridesPluginWristTrackingSettings() const
     {
         return !!bOverridePluginWristTrackingSettings;
@@ -164,42 +146,8 @@ public:
         bOverridePluginWristTrackingSettings = bInOverridePluginWristTrackingSettings;
     }
 
-    ESGPositionalTrackingHardware GetTrackingHardware() const;
-    void SetTrackingHardware(ESGPositionalTrackingHardware InTrackingHardware);
-
-    const FVector& GetTrackingHardwareLocationOffset() const;
-    void SetTrackingHardwareLocationOffset(const FVector& InTrackingHardwareLocationOffset);
-
-    const FRotator& GetTrackingHardwareRotationOffset() const;
-    void SetTrackingHardwareRotationOffset(const FRotator& InTrackingHardwareRotationOffset);
-
-    FORCEINLINE bool OverridesPluginWristTrackingDebugSettings() const
-    {
-        return !!bOverridePluginWristTrackingDebugSettings;
-    }
-
-    FORCEINLINE void OverridePluginWristTrackingDebugSettings(const bool bInOverridePluginWristTrackingDebugSettings)
-    {
-        bOverridePluginWristTrackingDebugSettings = bInOverridePluginWristTrackingDebugSettings;
-    }
-
-    bool GetDrawWristTrackerDebugGizmo() const;
-    void SetDrawWristTrackerDebugGizmo(bool bInDrawWristTrackerDebugGizmo);
-
-    const FSGDebugGizmoSettings& GetWristTrackerDebugGizmoSettings() const;
-    void SetWristTrackerDebugGizmoSettings(const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings);
-
-    FORCEINLINE bool IsLeft() const
-    {
-        return GetTrackingSource() == EControllerHand::Left;
-    }
-
-    FORCEINLINE bool IsRight() const
-    {
-        return GetTrackingSource() == EControllerHand::Right;
-    }
-
-    void SetRight(const bool bRight);
+    const FSGWristTrackingSettings& GetWristTrackingSettings() const;
+    void SetWristTrackingSettings(const FSGWristTrackingSettings& InWristTrackingSettings);
 
     FORCEINLINE const FVector& GetWristLocation() const
     {

Source/SenseGlove/Public/SenseGlove/GameFramework/SGPawn.h

@@ -573,19 +573,19 @@ public:
 
     FORCEINLINE bool CanGrab(const USGVirtualHandComponent* Hand, const AActor* Actor) const
     {
-        return Hand == HandLeft ? CanLeftHandGrab(Actor) : CanRightHandGrab(Actor);
+        return Hand == HandRight ? CanRightHandGrab(Actor) : CanLeftHandGrab(Actor);
     }
 
     FORCEINLINE bool IsGrabbing(const USGVirtualHandComponent* Hand, const AActor* Actor) const
     {
-        return Hand == HandLeft ? IsLeftHandGrabbing(Actor) : IsRightHandGrabbing(Actor);
+        return Hand == HandRight ? IsRightHandGrabbing(Actor) : IsLeftHandGrabbing(Actor);
     }
 
     bool IsGrabbing(const USGVirtualHandComponent* Hand, AActor*& OutActor) const;
 
     FORCEINLINE bool IsGrabbing(const USGVirtualHandComponent* Hand) const
     {
-        return Hand == HandLeft ? IsLeftHandGrabbing() : IsRightHandGrabbing();
+        return Hand == HandRight ? IsRightHandGrabbing() : IsLeftHandGrabbing();
     }
 
 public:
@@ -607,6 +607,6 @@ public:
 
     FORCEINLINE void Release(const USGVirtualHandComponent* Hand)
     {
-        return Hand == HandLeft ? ReleaseLeft() : ReleaseRight();
+        return Hand == HandRight ? ReleaseRight() : ReleaseLeft();
     }
 };

Source/SenseGlove/SenseGlove.Build.cs

@@ -56,6 +56,7 @@ public class SenseGlove : ModuleRules
                 "CoreUObject",
                 "Engine",
                 "HeadMountedDisplay",
+                "InputCore",
                 "SenseGloveConnect",
                 "SenseGloveCore",
                 "SenseGloveDebug",

Source/SenseGloveAndroid/SenseGloveAndroid_UPL.xml

@@ -59,12 +59,30 @@
                 <log text="SenseGloveAndroid [WARN]: this architecture is not supported!"/>
             </false>
         </if>
+
+        <setBoolFromProperty result="bCreateAFSProject" ini="Engine" section="/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings" property="bEnablePlugin" default="true"/>
     </init>
 
     <resourceCopies>
         <copyFile src="$S(PluginDir)/../ThirdParty/android/sgconnect.jar" dst="$S(BuildDir)/gradle/app/libs/sgconnect.jar" />
     </resourceCopies>
 
+    <gradleCopies>
+        <if condition="bCreateAFSProject">
+            <true>
+                <!-- Also copy into AFSProject -->
+                <!--
+                    We have a dependency in the buildGradleAdditions which
+                    isn't in the AFSProject which is compiled for shipping
+                    builds when AndroidFileServer (AFS) is enabled. To keep
+                    the size of the AFS APK small it doesn't automatically
+                    copy all the libs over.
+                -->
+                <copyFile src="$S(PluginDir)/../ThirdParty/android/sgconnect.jar" dst="$S(BuildDir)/gradle/AFSProject/app/libs/sgconnect.jar" />
+            </true>
+        </if>
+    </gradleCopies>
+
     <gradleProperties>
         <insert>
             kapt.incremental.apt=true
@@ -73,18 +91,15 @@
 
     <proguardAdditions>
         <insert>
-
             <!-- Disable obfuscation for SenseGlove classes -->
             -dontwarn com.senseglove.**
             -keep class com.senseglove.** { *; }
             -keep interface com.senseglove.** { *; }
             -keep public class com.senseglove.sgconnect.** { public protected *; }
-
         </insert>
     </proguardAdditions>
 
     <androidManifestUpdates>
-
         <!-- For target SDK 31 update the SplashActivity activity -->
         <loopElements tag="activity">
             <setStringFromAttribute result="activityName" tag="$" name="android:name"/>
@@ -100,7 +115,6 @@
         <addPermission android:name="android.permission.BLUETOOTH_ADMIN"/>
         <addPermission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
         <addPermission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-
     </androidManifestUpdates>
 
     <buildGradleAdditions>
@@ -123,7 +137,6 @@
             dependencies {
                 implementation files('libs/sgconnect.jar')
             }
-
         </insert>
     </buildGradleAdditions>
 

Source/SenseGloveConnectImpl/SenseGloveConnectImpl.Build.cs

@@ -87,10 +87,10 @@ public class SenseGloveConnectImpl : ModuleRules
 
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
-#elif UE_4_27_OR_LATER
+#elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r21e"));
 #else
-            Debug.Assert(false, "Developing for Android on UE versions older than 4.27 is not supported!");
+            Debug.Assert(false, "Developing for Android on UE versions older than 5.0 is not supported!");
 #endif
 
 #if UE_5_2_OR_LATER
@@ -151,8 +151,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -172,8 +170,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -185,18 +181,13 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_4_27_OR_LATER
+#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported engine version or compiler!");
@@ -241,10 +232,10 @@ public class SenseGloveConnectImpl : ModuleRules
 
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
-#elif UE_4_27_OR_LATER
+#elif UE_4_5_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r21e"));
 #else
-            Debug.Assert(false, "Developing for Android on UE versions older than 4.27 is not supported!");
+            Debug.Assert(false, "Developing for Android on UE versions older than 5.0 is not supported!");
 #endif
 
 #if UE_5_2_OR_LATER
@@ -305,8 +296,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -326,8 +315,6 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -339,18 +326,13 @@ public class SenseGloveConnectImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_4_27_OR_LATER
+#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported engine version or compiler!");

Source/SenseGloveCoreImpl/Private/SGCoreImpl/SGCoreEnumCast.cpp

@@ -313,14 +313,12 @@ FSGCoreEnumCast::FEPositionalTrackingHardware FSGCoreEnumCast::ToEPositionalTrac
         return FEPositionalTrackingHardware::Custom;
     case ESGPositionalTrackingHardware::ViveTracker:
         return FEPositionalTrackingHardware::ViveTracker;
-    case ESGPositionalTrackingHardware::OculusTouch:
-        return FEPositionalTrackingHardware::OculusTouch;
     case ESGPositionalTrackingHardware::Quest2Controller:
         return FEPositionalTrackingHardware::Quest2Controller;
-    case ESGPositionalTrackingHardware::PicoNeo2:
-        return FEPositionalTrackingHardware::PicoNeo2;
-    case ESGPositionalTrackingHardware::PicoNeo3:
-        return FEPositionalTrackingHardware::PicoNeo3;
+    case ESGPositionalTrackingHardware::ViveFocus3WristTracker:
+        return FEPositionalTrackingHardware::ViveFocus3WristTracker;
+    case ESGPositionalTrackingHardware::QuestProController:
+        return FEPositionalTrackingHardware::QuestProController;
     default:
         ensureAlwaysMsgf(false, TEXT("Unhandled enum cast item!"));
         break;
@@ -338,14 +336,12 @@ ESGPositionalTrackingHardware FSGCoreEnumCast::ToESGPositionalTrackingHardware(c
         return ESGPositionalTrackingHardware::Custom;
     case FEPositionalTrackingHardware::ViveTracker:
         return ESGPositionalTrackingHardware::ViveTracker;
-    case FEPositionalTrackingHardware::OculusTouch:
-        return ESGPositionalTrackingHardware::OculusTouch;
     case FEPositionalTrackingHardware::Quest2Controller:
         return ESGPositionalTrackingHardware::Quest2Controller;
-    case FEPositionalTrackingHardware::PicoNeo2:
-        return ESGPositionalTrackingHardware::PicoNeo2;
-    case FEPositionalTrackingHardware::PicoNeo3:
-        return ESGPositionalTrackingHardware::PicoNeo3;
+    case FEPositionalTrackingHardware::ViveFocus3WristTracker:
+        return ESGPositionalTrackingHardware::ViveFocus3WristTracker;
+    case FEPositionalTrackingHardware::QuestProController:
+        return ESGPositionalTrackingHardware::QuestProController;
     default:
         ensureAlwaysMsgf(false, TEXT("Unhandled enum cast item!"));
         break;

Source/SenseGloveCoreImpl/SenseGloveCoreImpl.Build.cs

@@ -86,10 +86,10 @@ public class SenseGloveCoreImpl : ModuleRules
 
 #if UE_5_1_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r25b"));
-#elif UE_4_27_OR_LATER
+#elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "r21e"));
 #else
-            Debug.Assert(false, "Developing for Android on UE versions older than 4.27 is not supported!");
+            Debug.Assert(false, "Developing for Android on UE versions older than 5.0 is not supported!");
 #endif
 
 #if UE_5_2_OR_LATER
@@ -150,8 +150,6 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -171,8 +169,6 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v21"));
 #elif UE_5_0_OR_LATER
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v20"));
-#elif UE_4_27_OR_LATER
-            LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "v19"));
 #else
             Debug.Assert(false, "Unsupported engine version or compiler!");
 #endif
@@ -184,18 +180,13 @@ public class SenseGloveCoreImpl : ModuleRules
             LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "win64"));
             switch (Target.WindowsPlatform.Compiler)
             {
-#if UE_4_27_OR_LATER
+#if UE_5_0_OR_LATER
                 case WindowsCompiler.VisualStudio2022:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc143"));
                     break;
                 case WindowsCompiler.VisualStudio2019:
                     LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc142"));
                     break;
-#endif
-#if ! UE_5_0_OR_LATER && UE_4_27_OR_LATER
-                case WindowsCompiler.VisualStudio2017:
-                    LibraryPath = Path.GetFullPath(Path.Combine(LibraryPath, "msvc141"));
-                    break;
 #endif
                 default:
                     Debug.Assert(false, "Unsupported engine version or compiler!");

Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp

@@ -78,6 +78,18 @@ void UVirtualHandComponentKismetLibrary::SetRight(USGVirtualHandComponent* Virtu
     VirtualHandComponent->SetRight(bInRight);
 }
 
+bool UVirtualHandComponentKismetLibrary::IsHiddenInGameIfNoGloveDetected(
+    const USGVirtualHandComponent* VirtualHandComponent)
+{
+    return VirtualHandComponent->IsHiddenInGameIfNoGloveDetected();
+}
+
+void UVirtualHandComponentKismetLibrary::SetHiddenIfNoGloveDetected(
+    USGVirtualHandComponent* VirtualHandComponent, const bool bInHiddenIfNoGloveDetected)
+{
+    VirtualHandComponent->SetHiddenIfNoGloveDetected(bInHiddenIfNoGloveDetected);
+}
+
 bool UVirtualHandComponentKismetLibrary::AutoStopsAllHapticsOnEndPlay(
     const USGVirtualHandComponent* VirtualHandComponent)
 {
@@ -204,18 +216,6 @@ void UVirtualHandComponentKismetLibrary::SetPinkyFingertipTouchSocketName(USGVir
     VirtualHandComponent->SetPinkyFingertipTouchSocketName(SocketName);
 }
 
-bool UVirtualHandComponentKismetLibrary::IsHiddenInGameIfNoGloveDetected(
-    const USGVirtualHandComponent* VirtualHandComponent)
-{
-    return VirtualHandComponent->IsHiddenInGameIfNoGloveDetected();
-}
-
-void UVirtualHandComponentKismetLibrary::SetHiddenIfNoGloveDetected(
-    USGVirtualHandComponent* VirtualHandComponent, const bool bInHiddenIfNoGloveDetected)
-{
-    VirtualHandComponent->SetHiddenIfNoGloveDetected(bInHiddenIfNoGloveDetected);
-}
-
 bool UVirtualHandComponentKismetLibrary::IsGloveConnected(const USGVirtualHandComponent* VirtualHandComponent)
 {
     return VirtualHandComponent->IsGloveConnected();

Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp

@@ -49,78 +49,17 @@ void UWristTrackerComponentKismetLibrary::OverridePluginWristTrackingSettings(
     WristTrackerComponent->OverridePluginWristTrackingSettings(bInOverridePluginWristTrackingSettings);
 }
 
-ESGPositionalTrackingHardware UWristTrackerComponentKismetLibrary::GetTrackingHardware(
+const FSGWristTrackingSettings& UWristTrackerComponentKismetLibrary::GetWristTrackingSettings(
     const USGWristTrackerComponent* WristTrackerComponent)
 {
-    return WristTrackerComponent->GetTrackingHardware();
+    return WristTrackerComponent->GetWristTrackingSettings();
 }
 
-void UWristTrackerComponentKismetLibrary::SetTrackingHardware(
-    USGWristTrackerComponent* WristTrackerComponent, ESGPositionalTrackingHardware InTrackingHardware)
-{
-    WristTrackerComponent->SetTrackingHardware(InTrackingHardware);
-}
-
-const FVector& UWristTrackerComponentKismetLibrary::GetTrackingHardwareLocationOffset(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->GetTrackingHardwareLocationOffset();
-}
-
-void UWristTrackerComponentKismetLibrary::SetTrackingHardwareLocationOffset(
+void UWristTrackerComponentKismetLibrary::SetWristTrackingSettings(
     USGWristTrackerComponent* WristTrackerComponent,
-    const FVector& InTrackingHardwareLocationOffset)
+    const FSGWristTrackingSettings& InWristTrackingSettings)
 {
-    WristTrackerComponent->SetTrackingHardwareLocationOffset(InTrackingHardwareLocationOffset);
-}
-
-const FRotator& UWristTrackerComponentKismetLibrary::GetTrackingHardwareRotationOffset(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->GetTrackingHardwareRotationOffset();
-}
-
-void UWristTrackerComponentKismetLibrary::SetTrackingHardwareRotationOffset(
-    USGWristTrackerComponent* WristTrackerComponent,
-    const FRotator& InTrackingHardwareRotationOffset)
-{
-    WristTrackerComponent->SetTrackingHardwareRotationOffset(InTrackingHardwareRotationOffset);
-}
-
-bool UWristTrackerComponentKismetLibrary::OverridesPluginWristTrackingDebugSettings(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->OverridesPluginWristTrackingDebugSettings();
-}
-
-void UWristTrackerComponentKismetLibrary::OverridePluginWristTrackingDebugSettings(
-    USGWristTrackerComponent* WristTrackerComponent, const bool bInOverridePluginWristTrackingDebugSettings)
-{
-    WristTrackerComponent->OverridePluginWristTrackingDebugSettings(bInOverridePluginWristTrackingDebugSettings);
-}
-
-bool UWristTrackerComponentKismetLibrary::GetDrawWristTrackerDebugGizmo(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->GetDrawWristTrackerDebugGizmo();
-}
-
-void UWristTrackerComponentKismetLibrary::SetDrawWristTrackerDebugGizmo(
-    USGWristTrackerComponent* WristTrackerComponent, const bool bInDrawWristTrackerDebugGizmo)
-{
-    WristTrackerComponent->SetDrawWristTrackerDebugGizmo(bInDrawWristTrackerDebugGizmo);
-}
-
-const FSGDebugGizmoSettings& UWristTrackerComponentKismetLibrary::GetWristTrackerDebugGizmoSettings(
-    const USGWristTrackerComponent* WristTrackerComponent)
-{
-    return WristTrackerComponent->GetWristTrackerDebugGizmoSettings();
-}
-
-void UWristTrackerComponentKismetLibrary::SetWristTrackerDebugGizmoSettings(
-    USGWristTrackerComponent* WristTrackerComponent, const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings)
-{
-    WristTrackerComponent->SetWristTrackerDebugGizmoSettings(InWristTrackerDebugGizmoSettings);
+    WristTrackerComponent->SetWristTrackingSettings(InWristTrackingSettings);
 }
 
 bool UWristTrackerComponentKismetLibrary::IsLeft(const USGWristTrackerComponent* WristTrackerComponent)

Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h

@@ -81,6 +81,13 @@ public:
     UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component")
     static void SetRight(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent, bool bInRight);
 
+    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component")
+    static bool IsHiddenInGameIfNoGloveDetected(const USGVirtualHandComponent* VirtualHandComponent);
+
+    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component")
+    static void SetHiddenIfNoGloveDetected(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
+                                           bool bInHiddenIfNoGloveDetected);
+
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component")
     static bool AutoStopsAllHapticsOnEndPlay(const USGVirtualHandComponent* VirtualHandComponent);
 
@@ -153,13 +160,6 @@ public:
     static void SetPinkyFingertipTouchSocketName(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
                                                  const FName& SocketName);
 
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component")
-    static bool IsHiddenInGameIfNoGloveDetected(const USGVirtualHandComponent* VirtualHandComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component")
-    static void SetHiddenIfNoGloveDetected(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent,
-                                           bool bInHiddenIfNoGloveDetected);
-
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component")
     static bool IsGloveConnected(const USGVirtualHandComponent* VirtualHandComponent);
 

Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h

@@ -38,9 +38,7 @@
 #pragma once
 
 #include "SGKismet/SGBlueprintFunctionLibrary.h"
-#include "SGTypes/SGCoreTypes.h"
-
-#include "SGSettings/SGDebugGizmoSettings.h"
+#include "SGSettings/SGWristTrackingSettings.h"
 
 #include "SGWristTrackerComponentKismetLibrary.generated.h"
 
@@ -63,47 +61,12 @@ public:
                                                     bool bInOverridePluginWristTrackingSettings);
 
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static ESGPositionalTrackingHardware GetTrackingHardware(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetTrackingHardware(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                    ESGPositionalTrackingHardware InTrackingHardware);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static const FVector& GetTrackingHardwareLocationOffset(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetTrackingHardwareLocationOffset(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                                  const FVector& InTrackingHardwareLocationOffset);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static const FRotator& GetTrackingHardwareRotationOffset(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetTrackingHardwareRotationOffset(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                                  const FRotator& InTrackingHardwareRotationOffset);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static bool OverridesPluginWristTrackingDebugSettings(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void OverridePluginWristTrackingDebugSettings(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                                         bool bInOverridePluginWristTrackingDebugSettings);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static bool GetDrawWristTrackerDebugGizmo(const USGWristTrackerComponent* WristTrackerComponent);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetDrawWristTrackerDebugGizmo(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                              bool bInDrawWristTrackerDebugGizmo);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
-    static const FSGDebugGizmoSettings& GetWristTrackerDebugGizmoSettings(
+    static const FSGWristTrackingSettings& GetWristTrackingSettings(
         const USGWristTrackerComponent* WristTrackerComponent);
 
     UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component")
-    static void SetWristTrackerDebugGizmoSettings(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
-                                                  const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings);
+    static void SetWristTrackingSettings(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent,
+                                         const FSGWristTrackingSettings& InWristTrackingSettings);
 
     UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Wrist Tracker Component")
     static bool IsLeft(const USGWristTrackerComponent* WristTrackerComponent);

Source/SenseGloveSettings/Private/SGSettings/SGDebugVirtualHandSettings.cpp

@@ -35,13 +35,32 @@
 
 #include "SGSettings/SGDebugVirtualHandSettings.h"
 
+FSGDebugVirtualHandSettings::FSGDebugVirtualHandSettings()
+    : bDrawDebugVirtualHand(false),
+      DrawingMode(ESGDebugVirtualHandDrawingMode::None),
+      CubeExtent(FVector(0.5f, 0.5f, 0.5f)),
+      CubeColor(255, 0, 0, 255),
+      CubeThickness(0.1f),
+      GizmoLength(1.0f),
+      GizmoThickness(1.0f),
+      GizmoXAxisColor(255, 0, 0, 255),
+      GizmoYAxisColor(255, 0, 0, 255),
+      GizmoZAxisColor(255, 0, 0, 255),
+      bPersistentLines(false),
+      LifeTimeModifier(1.1f),
+      DepthPriority(0)
+{
+}
+
 FSGDebugVirtualHandSettings::FSGDebugVirtualHandSettings(
+    const bool bInDrawDebugVirtualHand,
     const ESGDebugVirtualHandDrawingMode InDrawingMode,
     const FVector& InCubeExtent, const FColor& InCubeColor, const float InCubeThickness,
     const float InGizmoLength, const float InGizmoThickness,
     const FColor& InGizmoXAxisColor, const FColor& InGizmoYAxisColor, const FColor& InGizmoZAxisColor,
     const bool bInPersistentLines, const float InLifeTimeModifier, const uint8 InDepthPriority)
-    : DrawingMode(InDrawingMode),
+    : bDrawDebugVirtualHand(bInDrawDebugVirtualHand),
+      DrawingMode(InDrawingMode),
       CubeExtent(InCubeExtent),
       CubeColor(InCubeColor),
       CubeThickness(InCubeThickness),

Source/SenseGloveSettings/Private/SGSettings/SGSettings.cpp

@@ -42,10 +42,6 @@
 
 struct USGSettings::FImpl
 {
-    /************************
-     * Static methods
-     ************************/
-
     /************************
      * Owner object
      ************************/
@@ -65,16 +61,15 @@ struct USGSettings::FImpl
 
     FImpl(const FImpl& Rhs) = default;
     FImpl& operator=(const FImpl& Rhs) = default;
-
-    /************************
-     * Methods
-     ************************/
-
-    void ResetTrackingHardwareValuesToZero();
 };
 
 USGSettings* USGSettings::GetInstance()
 {
+    if (!ensureAlwaysMsgf(GEngine, TEXT("The engine has not been initialized!")))
+    {
+        return nullptr;
+    }
+
     USGSettings* Instance{GEngine->GetEngineSubsystem<USGSettings>()};
     return Instance;
 }
@@ -82,118 +77,25 @@ USGSettings* USGSettings::GetInstance()
 USGSettings::USGSettings()
     : Pimpl(TUniquePtr<FImpl, FImplDeleter>(new FImpl{this}, PimplDeleter))
 {
-    TrackingHardware = ESGPositionalTrackingHardware::None;
-
-    Pimpl->ResetTrackingHardwareValuesToZero();
-
-    TrackingHardware = ESGPositionalTrackingHardware::None;
-    TrackingHardwareLocationOffsetLeftHand = FVector::ZeroVector;
-    TrackingHardwareLocationOffsetRightHand = FVector::ZeroVector;
-    TrackingHardwareRotationOffsetLeftHand = FRotator::ZeroRotator;
-    TrackingHardwareRotationOffsetRightHand = FRotator::ZeroRotator;
-
-    bDrawWristTrackerDebugGizmo = false;
-    WristTrackerDebugGizmoSettings = FSGDebugGizmoSettings(
-        4.0f, 1.0f,
-        FColor(255, 0, 0, 255),
-        FColor(0, 255, 0, 255),
-        FColor(0, 0, 255, 255),
-        false, 1.1f, 0
+    WristTrackingSettings = FSGWristTrackingSettings(
+        ESGPositionalTrackingHardware::None,
+        FVector::ZeroVector,
+        FVector::ZeroVector,
+        FRotator::ZeroRotator,
+        FRotator::ZeroRotator,
+        EControllerHand::Left,
+        EControllerHand::Right,
+        false,
+        FSGDebugGizmoSettings(
+            4.0f, 1.0f,
+            FColor(255, 0, 0, 255),
+            FColor(0, 255, 0, 255),
+            FColor(0, 0, 255, 255),
+            false, 1.1f, 0
+            )
         );
 }
 
-const FVector& USGSettings::GetTrackingHardwareLocationOffsetLeftHand() const
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Getting TrackingHardwareLocationOffsetLeftHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    return TrackingHardwareLocationOffsetLeftHand;
-}
-
-void USGSettings::SetTrackingHardwareLocationOffsetLeftHand(const FVector& InTrackingHardwareLocationOffsetLeftHand)
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Setting TrackingHardwareLocationOffsetLeftHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    TrackingHardwareLocationOffsetLeftHand = InTrackingHardwareLocationOffsetLeftHand;
-}
-
-const FVector& USGSettings::GetTrackingHardwareLocationOffsetRightHand() const
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Getting TrackingHardwareLocationOffsetRightHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    return TrackingHardwareLocationOffsetRightHand;
-}
-
-void USGSettings::SetTrackingHardwareLocationOffsetRightHand(const FVector& InTrackingHardwareLocationOffsetRightHand)
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Setting TrackingHardwareLocationOffsetRightHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    TrackingHardwareLocationOffsetRightHand = InTrackingHardwareLocationOffsetRightHand;
-}
-
-const FRotator& USGSettings::GetTrackingHardwareRotationOffsetLeftHand() const
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT( "Getting TrackingHardwareRotationOffsetLeftHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    return TrackingHardwareRotationOffsetLeftHand;
-}
-
-void USGSettings::SetTrackingHardwareRotationOffsetLeftHand(
-    const FRotator& InTrackingHardwareRotationOffsetLeftHand)
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT("Setting TrackingHardwareRotationOffsetRightHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    TrackingHardwareRotationOffsetLeftHand = InTrackingHardwareRotationOffsetLeftHand;
-}
-
-const FRotator& USGSettings::GetTrackingHardwareRotationOffsetRightHand() const
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT("Getting TrackingHardwareRotationOffsetRightHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    return TrackingHardwareRotationOffsetRightHand;
-}
-
-void USGSettings::SetTrackingHardwareRotationOffsetRightHand(
-    const FRotator& InTrackingHardwareRotationOffsetRightHand)
-{
-    ensureAlwaysMsgf(
-        TrackingHardware == ESGPositionalTrackingHardware::Custom,
-        TEXT("Setting TrackingHardwareRotationOffsetRightHand is only permitted when TrackingHardware is set to"
-            " Custom!"));
-    TrackingHardwareRotationOffsetRightHand = InTrackingHardwareRotationOffsetRightHand;
-}
-
-const FSGDebugGizmoSettings& USGSettings::GetWristTrackerDebugGizmoSettings() const
-{
-    ensureAlwaysMsgf(
-        GetDrawWristTrackerDebugGizmo(),
-        TEXT("Getting DebugWristTrackerGizmoThickness is only permitted when bDrawDebugWristTrackerGizmo is"
-            " enabled!"));
-    return WristTrackerDebugGizmoSettings;
-}
-
-void USGSettings::SetWristTrackerDebugGizmoSettings(const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings)
-{
-    ensureAlwaysMsgf(
-        GetDrawWristTrackerDebugGizmo(),
-        TEXT("Setting DebugWristTrackerGizmoThickness is only permitted when bDrawDebugWristTrackerGizmo is"
-            " enabled!"));
-    WristTrackerDebugGizmoSettings = InWristTrackerDebugGizmoSettings;
-}
-
 bool USGSettings::ShouldCreateSubsystem(UObject* Outer) const
 {
     return true;
@@ -221,41 +123,6 @@ void USGSettings::Deinitialize()
     SGLOG("The SenseGlove settings singleton has been successfully de-initialized!");
 }
 
-#if WITH_EDITOR
-bool USGSettings::CanEditChange(const FProperty* InProperty) const
-{
-    bool bCanEditChange = Super::CanEditChange(InProperty);
-
-    /*const FName PropertyName{InProperty ? InProperty->GetFName() : NAME_None};
-
-    if (PropertyName == GET_MEMBER_NAME_CHECKED(USGSettings, TrackingHardware))
-    {
-        return TrackingHardware == ESGPositionalTrackingHardware::Custom;
-    }*/
-
-    return bCanEditChange;
-}
-#endif  /* WITH_EDITOR */
-
-#if WITH_EDITOR
-void USGSettings::PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent)
-{
-    Super::PostEditChangeProperty(PropertyChangedEvent);
-
-    const FName PropertyName{
-        PropertyChangedEvent.Property
-        ? PropertyChangedEvent.Property->GetFName()
-        : NAME_None
-    };
-
-    if (PropertyName == GET_MEMBER_NAME_CHECKED(USGSettings, TrackingHardware))
-    {
-        Pimpl->ResetTrackingHardwareValuesToZero();
-        return;
-    }
-}
-#endif  /* WITH_EDITOR */
-
 USGSettings::FImpl::FImpl(USGSettings* InOwner)
     : Owner(InOwner)
 {
@@ -263,14 +130,6 @@ USGSettings::FImpl::FImpl(USGSettings* InOwner)
 
 USGSettings::FImpl::~FImpl() = default;
 
-void USGSettings::FImpl::ResetTrackingHardwareValuesToZero()
-{
-    Owner->TrackingHardwareLocationOffsetLeftHand = FVector::ZeroVector;
-    Owner->TrackingHardwareLocationOffsetRightHand = FVector::ZeroVector;
-    Owner->TrackingHardwareRotationOffsetLeftHand = FRotator::ZeroRotator;
-    Owner->TrackingHardwareRotationOffsetRightHand = FRotator::ZeroRotator;
-}
-
 void USGSettings::FImplDeleter::operator()(const FImpl* P) const
 {
     delete P;

Source/SenseGloveSettings/Private/SGSettings/SGWristTrackingSettings.cpp

@@ -0,0 +1,71 @@
+/**
+ * @file
+ *
+ * @author  Mamadou Babaei <mamadou@senseglove.com>
+ *
+ * @section LICENSE
+ *
+ * (The MIT License)
+ *
+ * Copyright (c) 2020 - 2023 SenseGlove
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * @section DESCRIPTION
+ *
+ *
+ */
+
+
+#include "SGSettings/SGWristTrackingSettings.h"
+
+FSGWristTrackingSettings::FSGWristTrackingSettings()
+    : TrackingHardware(ESGPositionalTrackingHardware::None),
+      TrackingHardwareLocationOffsetLeftHand(FVector::ZeroVector),
+      TrackingHardwareLocationOffsetRightHand(FVector::ZeroVector),
+      TrackingHardwareRotationOffsetLeftHand(FRotator::ZeroRotator),
+      TrackingHardwareRotationOffsetRightHand(FRotator::ZeroRotator),
+      LeftHandMotionSource(EControllerHand::Left),
+      RightHandMotionSource(EControllerHand::Right),
+      bDrawWristTrackerDebugGizmo(false),
+      WristTrackerDebugGizmoSettings(FSGDebugGizmoSettings())
+{
+}
+
+FSGWristTrackingSettings::FSGWristTrackingSettings(
+    const ESGPositionalTrackingHardware InTrackingHardware,
+    const FVector& InTrackingHardwareLocationOffsetLeftHand,
+    const FVector& InTrackingHardwareLocationOffsetRightHand,
+    const FRotator& InTrackingHardwareRotationOffsetLeftHand,
+    const FRotator& InTrackingHardwareRotationOffsetRightHand,
+    const EControllerHand InLeftHandMotionSource,
+    const EControllerHand InRightHandMotionSource,
+    const bool bInDrawWristTrackerDebugGizmo,
+    const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings)
+    : TrackingHardware(InTrackingHardware),
+      TrackingHardwareLocationOffsetLeftHand(InTrackingHardwareLocationOffsetLeftHand),
+      TrackingHardwareLocationOffsetRightHand(InTrackingHardwareLocationOffsetRightHand),
+      TrackingHardwareRotationOffsetLeftHand(InTrackingHardwareRotationOffsetLeftHand),
+      TrackingHardwareRotationOffsetRightHand(InTrackingHardwareRotationOffsetRightHand),
+      LeftHandMotionSource(InLeftHandMotionSource),
+      RightHandMotionSource(InRightHandMotionSource),
+      bDrawWristTrackerDebugGizmo(bInDrawWristTrackerDebugGizmo),
+      WristTrackerDebugGizmoSettings(InWristTrackerDebugGizmoSettings)
+{
+}

Source/SenseGloveSettings/Public/SGSettings/SGDebugVirtualHandSettings.h

@@ -48,6 +48,10 @@ struct SENSEGLOVESETTINGS_API FSGDebugVirtualHandSettings
 
 public:
     UPROPERTY(EditAnywhere, Category = "Debug Virtual Hand Settings")
+    uint8 bDrawDebugVirtualHand : 1;
+
+    UPROPERTY(EditAnywhere, Category = "Debug Virtual Hand Settings",
+        meta=(EditCondition="bDrawDebugVirtualHand", EditConditionHides))
     ESGDebugVirtualHandDrawingMode DrawingMode;
 
     UPROPERTY(EditAnywhere, Category = "Debug Virtual Hand Settings",
@@ -95,7 +99,10 @@ public:
     uint8 DepthPriority;
 
 public:
+    FSGDebugVirtualHandSettings();
+
     explicit FSGDebugVirtualHandSettings(
+        bool bInDrawDebugVirtualHand,
         ESGDebugVirtualHandDrawingMode InDrawingMode = ESGDebugVirtualHandDrawingMode::None,
         const FVector& InCubeExtent = FVector(0.5f, 0.5f, 0.5f),
         const FColor& InCubeColor = FColor(255, 0, 0, 255),

Source/SenseGloveSettings/Public/SGSettings/SGSettings.h

@@ -42,8 +42,7 @@
 #include "Templates/UniquePtr.h"
 #include "UObject/ObjectMacros.h"
 
-#include "SGSettings/SGDebugGizmoSettings.h"
-#include "SGTypes/SGCoreTypes.h"
+#include "SGSettings/SGWristTrackingSettings.h"
 
 #include "SGSettings.generated.h"
 
@@ -67,101 +66,26 @@ private:
     FImplDeleter PimplDeleter;
 
 private:
-    /**
-     * If set to Custom, any desired location and rotation can be specified.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking")
-    ESGPositionalTrackingHardware TrackingHardware;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
-        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
-    FVector TrackingHardwareLocationOffsetLeftHand;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
-        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
-    FVector TrackingHardwareLocationOffsetRightHand;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
-        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
-    FRotator TrackingHardwareRotationOffsetLeftHand;
-
-    /**
-     * Valid only if TrackingHardware is set to Custom.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
-        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
-    FRotator TrackingHardwareRotationOffsetRightHand;
-
-    /**
-     * If enabled, draws debug Wrist trackers where possible.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking Debug")
-    uint8 bDrawWristTrackerDebugGizmo : 1;
-
-    /**
-     * Valid only if bDrawDebugWristTrackerGizmo is enabled.
-     */
-    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking Debug",
-        meta=(EditCondition="bDrawDebugWristTrackerGizmo", EditConditionHides))
-    FSGDebugGizmoSettings WristTrackerDebugGizmoSettings;
+    UPROPERTY(Config, EditDefaultsOnly, Category = "SenseGlove")
+    FSGWristTrackingSettings WristTrackingSettings;
 
 public:
     USGSettings();
 
 public:
-    FORCEINLINE ESGPositionalTrackingHardware GetTrackingHardware() const
+    FORCEINLINE const FSGWristTrackingSettings& GetWristTrackingSettings() const
     {
-        return TrackingHardware;
+        return WristTrackingSettings;
     }
 
-    FORCEINLINE void SetTrackingHardware(const ESGPositionalTrackingHardware InTrackingHardware)
+    void SetWristTrackingSettings(const FSGWristTrackingSettings& InWristTrackingSettings)
     {
-        TrackingHardware = InTrackingHardware;
+        WristTrackingSettings = InWristTrackingSettings;
     }
 
-    const FVector& GetTrackingHardwareLocationOffsetLeftHand() const;
-    void SetTrackingHardwareLocationOffsetLeftHand(const FVector& InTrackingHardwareLocationOffsetLeftHand);
-
-    const FVector& GetTrackingHardwareLocationOffsetRightHand() const;
-    void SetTrackingHardwareLocationOffsetRightHand(const FVector& InTrackingHardwareLocationOffsetRightHand);
-
-    const FRotator& GetTrackingHardwareRotationOffsetLeftHand() const;
-    void SetTrackingHardwareRotationOffsetLeftHand(const FRotator& InTrackingHardwareRotationOffsetLeftHand);
-
-    const FRotator& GetTrackingHardwareRotationOffsetRightHand() const;
-    void SetTrackingHardwareRotationOffsetRightHand(const FRotator& InTrackingHardwareRotationOffsetRightHand);
-
-    FORCEINLINE bool GetDrawWristTrackerDebugGizmo() const
-    {
-        return !!bDrawWristTrackerDebugGizmo;
-    }
-
-    void SetDrawWristTrackerDebugGizmo(const bool bInDrawWristTrackerDebugGizmo)
-    {
-        bDrawWristTrackerDebugGizmo = bInDrawWristTrackerDebugGizmo;
-    }
-
-    const FSGDebugGizmoSettings& GetWristTrackerDebugGizmoSettings() const;
-    void SetWristTrackerDebugGizmoSettings(const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings);
-
 public:
     virtual bool ShouldCreateSubsystem(UObject* Outer) const override;
 
     virtual void Initialize(FSubsystemCollectionBase& Collection) override;
     virtual void Deinitialize() override;
-
-public:
-#if WITH_EDITOR
-    virtual bool CanEditChange(const FProperty* InProperty) const override;
-    virtual void PostEditChangeProperty(FPropertyChangedEvent& PropertyChangedEvent) override;
-#endif  /* WITH_EDITOR */
 };

Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingSettings.h

@@ -0,0 +1,126 @@
+/**
+ * @file
+ *
+ * @author  Mamadou Babaei <mamadou@senseglove.com>
+ *
+ * @section LICENSE
+ *
+ * (The MIT License)
+ *
+ * Copyright (c) 2020 - 2023 SenseGlove
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * @section DESCRIPTION
+ *
+ *
+ */
+
+
+#pragma once
+
+#include "InputCoreTypes.h"
+#include "UObject/ObjectMacros.h"
+
+#include "SGSettings/SGDebugGizmoSettings.h"
+#include "SGTypes/SGCoreTypes.h"
+
+#include "SGWristTrackingSettings.generated.h"
+
+USTRUCT(BlueprintType)
+struct SENSEGLOVESETTINGS_API FSGWristTrackingSettings
+{
+    GENERATED_USTRUCT_BODY()
+
+public:
+    /**
+     * If set to Custom, any desired location and rotation can be specified.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking")
+    ESGPositionalTrackingHardware TrackingHardware;
+
+    /**
+     * Valid only if TrackingHardware is set to Custom.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
+        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
+    FVector TrackingHardwareLocationOffsetLeftHand;
+
+    /**
+     * Valid only if TrackingHardware is set to Custom.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
+        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
+    FVector TrackingHardwareLocationOffsetRightHand;
+
+    /**
+     * Valid only if TrackingHardware is set to Custom.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
+        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
+    FRotator TrackingHardwareRotationOffsetLeftHand;
+
+    /**
+     * Valid only if TrackingHardware is set to Custom.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Wrist Tracking",
+        meta=(EditCondition="TrackingHardware == ESGPositionalTrackingHardware::Custom", EditConditionHides))
+    FRotator TrackingHardwareRotationOffsetRightHand;
+
+    /**
+     * Determines which motion source to use.
+     * For Oculus this is usually Left, and for VIVE usually LeftFoot.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category="Wrist Tracking")
+    EControllerHand LeftHandMotionSource;
+
+    /**
+     * Determines which motion source to use.
+     * For Oculus this is usually Right, and for VIVE usually RightFoot.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category="Wrist Tracking")
+    EControllerHand RightHandMotionSource;
+
+    /**
+     * If enabled, draws debug Wrist trackers where possible.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Wrist Tracking")
+    uint8 bDrawWristTrackerDebugGizmo : 1;
+
+    /**
+     * Valid only if bDrawDebugWristTrackerGizmo is enabled.
+     */
+    UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Wrist Tracking",
+        meta=(EditCondition="bDrawWristTrackerDebugGizmo", EditConditionHides))
+    FSGDebugGizmoSettings WristTrackerDebugGizmoSettings;
+
+public:
+    FSGWristTrackingSettings();
+
+    explicit FSGWristTrackingSettings(
+        ESGPositionalTrackingHardware InTrackingHardware,
+        const FVector& InTrackingHardwareLocationOffsetLeftHand,
+        const FVector& InTrackingHardwareLocationOffsetRightHand,
+        const FRotator& InTrackingHardwareRotationOffsetLeftHand,
+        const FRotator& InTrackingHardwareRotationOffsetRightHand,
+        EControllerHand InLeftHandMotionSource,
+        EControllerHand InRightHandMotionSource,
+        bool bInDrawWristTrackerDebugGizmo,
+        const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings);
+};

Source/SenseGloveSettings/SenseGloveSettings.Build.cs

@@ -54,6 +54,7 @@ public class SenseGloveSettings : ModuleRules
             {
                 "CoreUObject",
                 "Engine",
+                "InputCore",
                 "SenseGloveCore",
                 "SenseGloveLog",
                 "SenseGloveTypes",

Source/SenseGloveSettingsKismet/Private/SGSettingsKismet/SGSettingsKismetLibrary.cpp

@@ -42,79 +42,13 @@ USGSettings* USGSettingsKismetLibrary::GetInstance()
     return USGSettings::GetInstance();
 }
 
-ESGPositionalTrackingHardware USGSettingsKismetLibrary::GetTrackingHardware(const USGSettings* Settings)
+const FSGWristTrackingSettings& USGSettingsKismetLibrary::GetWristTrackingSettings(const USGSettings* Settings)
 {
-    return Settings->GetTrackingHardware();
+    return Settings->GetWristTrackingSettings();
 }
 
-void USGSettingsKismetLibrary::SetTrackingHardware(
-    USGSettings* Settings, const ESGPositionalTrackingHardware InTrackingHardware)
+void USGSettingsKismetLibrary::SetWristTrackingSettings(
+    USGSettings* Settings, const FSGWristTrackingSettings& InWristTrackingSettings)
 {
-    Settings->SetTrackingHardware(InTrackingHardware);
-}
-
-const FVector& USGSettingsKismetLibrary::GetTrackingHardwareLocationOffsetLeftHand(const USGSettings* Settings)
-{
-    return Settings->GetTrackingHardwareLocationOffsetLeftHand();
-}
-
-void USGSettingsKismetLibrary::SetTrackingHardwareLocationOffsetLeftHand(
-    USGSettings* Settings, const FVector& InTrackingHardwareLocationOffsetLeftHand)
-{
-    Settings->SetTrackingHardwareLocationOffsetLeftHand(InTrackingHardwareLocationOffsetLeftHand);
-}
-
-const FVector& USGSettingsKismetLibrary::GetTrackingHardwareLocationOffsetRightHand(const USGSettings* Settings)
-{
-    return Settings->GetTrackingHardwareLocationOffsetRightHand();
-}
-
-void USGSettingsKismetLibrary::SetTrackingHardwareLocationOffsetRightHand(
-    USGSettings* Settings, const FVector& InTrackingHardwareLocationOffsetRightHand)
-{
-    Settings->SetTrackingHardwareLocationOffsetRightHand(InTrackingHardwareLocationOffsetRightHand);
-}
-
-const FRotator& USGSettingsKismetLibrary::GetTrackingHardwareRotationOffsetLeftHand(const USGSettings* Settings)
-{
-    return Settings->GetTrackingHardwareRotationOffsetLeftHand();
-}
-
-void USGSettingsKismetLibrary::SetTrackingHardwareRotationOffsetLeftHand(
-    USGSettings* Settings, const FRotator& InTrackingHardwareRotationOffsetLeftHand)
-{
-    Settings->SetTrackingHardwareRotationOffsetLeftHand(InTrackingHardwareRotationOffsetLeftHand);
-}
-
-const FRotator& USGSettingsKismetLibrary::GetTrackingHardwareRotationOffsetRightHand(const USGSettings* Settings)
-{
-    return Settings->GetTrackingHardwareRotationOffsetRightHand();
-}
-
-void USGSettingsKismetLibrary::SetTrackingHardwareRotationOffsetRightHand(
-    USGSettings* Settings, const FRotator& InTrackingHardwareRotationOffsetRightHand)
-{
-    Settings->SetTrackingHardwareRotationOffsetRightHand(InTrackingHardwareRotationOffsetRightHand);
-}
-
-bool USGSettingsKismetLibrary::GetDrawWristTrackerDebugGizmo(const USGSettings* Settings)
-{
-    return Settings->GetDrawWristTrackerDebugGizmo();
-}
-
-void USGSettingsKismetLibrary::SetDrawWristTrackerDebugGizmo(
-    USGSettings* Settings, const bool bInDrawWristTrackerDebugGizmo)
-{
-    Settings->SetDrawWristTrackerDebugGizmo(bInDrawWristTrackerDebugGizmo);
-}
-
-const FSGDebugGizmoSettings& USGSettingsKismetLibrary::GetWristTrackerDebugGizmoSettings(const USGSettings* Settings)
-{
-    return Settings->GetWristTrackerDebugGizmoSettings();
-}
-
-void USGSettingsKismetLibrary::SetWristTrackerDebugGizmoSettings(USGSettings* Settings,
-    const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings)
-{
-    Settings->SetWristTrackerDebugGizmoSettings(InWristTrackerDebugGizmoSettings);
+    Settings->SetWristTrackingSettings(InWristTrackingSettings);
 }

Source/SenseGloveSettingsKismet/Public/SGSettingsKismet/SGSettingsKismetLibrary.h

@@ -36,9 +36,7 @@
 #pragma once
 
 #include "SGKismet/SGBlueprintFunctionLibrary.h"
-#include "SGTypes/SGCoreTypes.h"
-
-#include "SGSettings/SGDebugGizmoSettings.h"
+#include "SGSettings/SGWristTrackingSettings.h"
 
 #include "SGSettingsKismetLibrary.generated.h"
 
@@ -54,50 +52,9 @@ public:
     static USGSettings* GetInstance();
 
     UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static ESGPositionalTrackingHardware GetTrackingHardware(const USGSettings* Settings);
+    static const FSGWristTrackingSettings& GetWristTrackingSettings(const USGSettings* Settings);
 
     UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetTrackingHardware(UPARAM(ref) USGSettings* Settings,
-                                    ESGPositionalTrackingHardware InTrackingHardware);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static const FVector& GetTrackingHardwareLocationOffsetLeftHand(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetTrackingHardwareLocationOffsetLeftHand(UPARAM(ref) USGSettings* Settings,
-                                                          const FVector& InTrackingHardwareLocationOffsetLeftHand);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static const FVector& GetTrackingHardwareLocationOffsetRightHand(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetTrackingHardwareLocationOffsetRightHand(UPARAM(ref) USGSettings* Settings,
-                                                           const FVector& InTrackingHardwareLocationOffsetRightHand);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static const FRotator& GetTrackingHardwareRotationOffsetLeftHand(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetTrackingHardwareRotationOffsetLeftHand(UPARAM(ref) USGSettings* Settings,
-                                                          const FRotator& InTrackingHardwareRotationOffsetLeftHand);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static const FRotator& GetTrackingHardwareRotationOffsetRightHand(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetTrackingHardwareRotationOffsetRightHand(UPARAM(ref) USGSettings* Settings,
-                                                           const FRotator& InTrackingHardwareRotationOffsetRightHand);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static bool GetDrawWristTrackerDebugGizmo(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetDrawWristTrackerDebugGizmo(UPARAM(ref) USGSettings* Settings, bool bInDrawWristTrackerDebugGizmo);
-
-    UFUNCTION(BlueprintPure, Category="SenseGlove | Settings")
-    static const FSGDebugGizmoSettings& GetWristTrackerDebugGizmoSettings(const USGSettings* Settings);
-
-    UFUNCTION(BlueprintCallable, Category="SenseGlove | Settings")
-    static void SetWristTrackerDebugGizmoSettings(UPARAM(ref) USGSettings* Settings,
-                                                  const FSGDebugGizmoSettings& InWristTrackerDebugGizmoSettings);
+    static void SetWristTrackingSettings(UPARAM(ref) USGSettings* Settings,
+                                         const FSGWristTrackingSettings& InWristTrackingSettings);
 };

Source/SenseGloveTypes/Public/SGTypes/SGCoreTypes.h

@@ -256,20 +256,17 @@ enum class ESGPositionalTrackingHardware : uint8
     /* Custom tracking hardware, we don't apply any offsets. */
     Custom UMETA(DisplayName = "Custom"),
 
-    /* HTC Vive Tracker (v1.0 or v2.0). */
-    ViveTracker UMETA(DisplayName = "Vive Tracker"),
-
-    /* Oculus Touch controller (left or right) for Rift S and Quest 1. */
-    OculusTouch UMETA(DisplayName = "Oculus Touch"),
+    /* HTC VIVE Tracker (v1.0 or v2.0). */
+    ViveTracker UMETA(DisplayName = "VIVE Tracker"),
 
     /* Touch controller for Oculus Quest 2. */
-    Quest2Controller UMETA(DisplayName = "Quest2 Controller"),
+    Quest2Controller UMETA(DisplayName = "Quest 2 Controller"),
 
-    /* Pico Neo 2 Controller(s). */
-    PicoNeo2 UMETA(DisplayName = "Pico Neo 2"),
+    /* Wrist tracker for the VIVE Focus 3. */
+    ViveFocus3WristTracker UMETA(DisplayName = "VIVE Focus 3 Wrist Tracker"),
 
-    /* Pico Neo 2 Controller(s). */
-    PicoNeo3 UMETA(DisplayName = "Pico Neo 3"),
+    /* Oculus Touch Controller that comes with the Meta Quest Pro. */
+    QuestProController UMETA(DisplayName = "Quest Pro Controller"),
 };
 
 /* Indices to access Sensor Data in Shared Memory. */