UnrealEngine/Plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit e16c1d216f.
This commit is contained in:
Mamadou Babaei
2024-08-16 16:44:30 +02:00
parent fac9e0e7ce
commit e8317c31b2
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/SenseGloveSettings/Private/SGSettings/SGGloveTrackingSettings.cpp
+3 -6
View File
@@ -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)
{
}
Source/SenseGloveSettings/Private/SGSettings/SGTrackingSettings.cpp
+4 -1
View File
@@ -37,6 +37,7 @@
FSGTrackingSettings::FSGTrackingSettings()
: FSGTrackingSettings{
false,
FSGGloveTrackingSettings{},
FSGHandTrackingSettings{},
FSGHMDTrackingSettings{},
@@ -46,11 +47,13 @@ FSGTrackingSettings::FSGTrackingSettings()
}
FSGTrackingSettings::FSGTrackingSettings(
const bool bInFallbackToHandTrackingIfNoGloveDetected,
const FSGGloveTrackingSettings& InGloveTrackingSettings,
const FSGHandTrackingSettings& InHandTrackingSettings,
const FSGHMDTrackingSettings& InHmdTrackingSettings,
const FSGWristTrackingSettings& InWristTrackingSettings)
: GloveTrackingSettings(InGloveTrackingSettings),
: bFallbackToHandTrackingIfNoGloveDetected(bInFallbackToHandTrackingIfNoGloveDetected),
GloveTrackingSettings(InGloveTrackingSettings),
HandTrackingSettings(InHandTrackingSettings),
HMDTrackingSettings(InHmdTrackingSettings),
WristTrackingSettings(InWristTrackingSettings)
Source/SenseGloveSettings/Public/SGSettings/SGGloveTrackingSettings.h
+1 -9
View File
@@ -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);
};
Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h
+8
View File
@@ -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,