From 94c7c251d8afe4b4f671d8cca5eedd0af33d1735 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Thu, 1 Aug 2024 15:09:21 +0200 Subject: [PATCH] Revert "move bFallbackToHandTrackingIfNoGloveDetected from tracking settings to glove tracking settings" This reverts commit e16c1d216fcf65e20f7992178bf2683316285228. --- .../Private/SGSettings/SGGloveTrackingSettings.cpp | 9 +++------ .../Private/SGSettings/SGTrackingSettings.cpp | 5 ++++- .../Public/SGSettings/SGGloveTrackingSettings.h | 10 +--------- .../Public/SGSettings/SGTrackingSettings.h | 8 ++++++++ .../Private/SGTracking/SGXRTracker.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp b/Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp index 2a42db3c..9a90247f 100644 --- a/Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp +++ b/Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp @@ -37,16 +37,13 @@ FSGGloveTrackingSettings::FSGGloveTrackingSettings() : FSGGloveTrackingSettings{ - 1000.0f / 60.0f, - false + 1000.0f / 60.0f } { } FSGGloveTrackingSettings::FSGGloveTrackingSettings( - const float InGloveConnectivityCheckInterval, - const bool bInFallbackToHandTrackingIfNoGloveDetected) - : GloveConnectivityCheckInterval(InGloveConnectivityCheckInterval), - bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected) + const float InGloveConnectivityCheckInterval) + : GloveConnectivityCheckInterval(InGloveConnectivityCheckInterval) { } \ No newline at end of file diff --git a/Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp b/Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp index 8dcc8391..2a14945b 100644 --- a/Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp +++ b/Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp @@ -37,6 +37,7 @@ FSGTrackingSettings::FSGTrackingSettings() : FSGTrackingSettings{ + false, FSGGloveTrackingSettings{}, FSGHandTrackingSettings{}, FSGHMDTrackingSettings{}, @@ -46,11 +47,13 @@ FSGTrackingSettings::FSGTrackingSettings() } FSGTrackingSettings::FSGTrackingSettings( + const bool bInFallbackToHandTrackingIfNoGloveDetected, const FSGGloveTrackingSettings& InGloveTrackingSettings, const FSGHandTrackingSettings& InHandTrackingSettings, const FSGHMDTrackingSettings& InHmdTrackingSettings, const FSGWristTrackingSettings& InWristTrackingSettings) - : GloveTrackingSettings(InGloveTrackingSettings), + : bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected), + GloveTrackingSettings(InGloveTrackingSettings), HandTrackingSettings(InHandTrackingSettings), HMDTrackingSettings(InHmdTrackingSettings), WristTrackingSettings(InWristTrackingSettings) diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h index b04d6455..f3adb818 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h @@ -54,17 +54,9 @@ public: UPROPERTY(Config, EditDefaultsOnly, Category="Glove Tracking") float GloveConnectivityCheckInterval; - /** - * If false, only a real glove will be tracked, otherwise will fall back to hand tracking if available and - * supported by the HMD device. - */ - UPROPERTY(Config, EditDefaultsOnly, Category="Tracking") - bool bFallbackToHandTrackingIfNoGloveDetected; - public: FSGGloveTrackingSettings(); explicit FSGGloveTrackingSettings( - float InGloveConnectivityCheckInterval, - bool bInFallbackToHandTrackingIfNoGloveDetected); + float InGloveConnectivityCheckInterval); }; \ No newline at end of file diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h index fca54219..7446f2f0 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h @@ -54,6 +54,13 @@ struct SENSEGLOVESETTINGS_API FSGTrackingSettings GENERATED_USTRUCT_BODY() public: + /** + * If false, only a real glove will be tracked, otherwise will fall back to hand tracking if available and + * supported by the HMD device. + */ + UPROPERTY(Config, EditDefaultsOnly, Category="Tracking") + bool bFallbackToHandTrackingIfNoGloveDetected; + UPROPERTY(Config, EditDefaultsOnly, Category="Tracking") FSGGloveTrackingSettings GloveTrackingSettings; @@ -71,6 +78,7 @@ public: FSGTrackingSettings(); FSGTrackingSettings( + bool bInFallbackToHandTrackingIfNoGloveDetected, const FSGGloveTrackingSettings& InGloveTrackingSettings, const FSGHandTrackingSettings& InHandTrackingSettings, const FSGHMDTrackingSettings& InHmdTrackingSettings, diff --git a/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp b/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp index 1ed1a138..8a12407a 100644 --- a/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp +++ b/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp @@ -106,7 +106,7 @@ struct FSGXRTracker::FImpl const USGSettings* Settings{USGSettings::GetInstance()}; ensureAlwaysMsgf(Settings, TEXT("The settings subsystem has not been initialized!")); const bool bFallbackToHandTrackingIfNoGloveDetected = - Settings->GetTrackingSettings().GloveTrackingSettings.bFallbackToHandTrackingIfNoGloveDetected; + Settings->GetTrackingSettings().bFallbackToHandTrackingIfNoGloveDetected; return bFallbackToHandTrackingIfNoGloveDetected; }