diff --git a/Handbook/src/appendix/changelog.md b/Handbook/src/appendix/changelog.md index f1f8a191..431830d2 100644 --- a/Handbook/src/appendix/changelog.md +++ b/Handbook/src/appendix/changelog.md @@ -100,6 +100,7 @@ This is a minor release focusing mainly on bringing OpenXR-compatible hand track - The Planned Features Completion Status section of the main README file has been migrated to /Handbook/src/overview/planned-features-completion-status.md. - The Directory Structure section of the main README file has been migrated to /Handbook/src/overview/directory-structure.md. - The SenseGlove settings' main config struct is now marked as DefaultConfig which means it does not require to be saved when settings are changed and they take effect immediately as the user updates them. +- Replaced all bitfield uproperties with booleans. ### Removed @@ -666,4 +667,4 @@ This is a minor release focusing on adherence to the Unreal Engine Marketplace G ### Added -- Initial public release of the SenseGlove haptic API for Unreal Engine with support for Microsoft Windows and GNU/Linux. +- Initial public release of the SenseGlove haptic API for Unreal Engine with support for Microsoft Windows and GNU/Linux. \ No newline at end of file diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp index 3f532aec..d48f0df0 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGVirtualHandComponent.cpp @@ -148,7 +148,7 @@ struct USGVirtualHandComponent::FImpl FORCEINLINE bool ShouldDrawDebugVirtualHand() const { const FSGVirtualHandDebuggingSettings& Settings{Owner->GetVirtualHandSettings().DebuggingSettings}; - const bool bDraw = !!Settings.bDrawDebugVirtualHand + const bool bDraw = Settings.bDrawDebugVirtualHand && Settings.DrawingMode != ESGDebugVirtualHandDrawingMode::None; return bDraw; } @@ -280,7 +280,7 @@ FSGVirtualHandSettings USGVirtualHandComponent::GetVirtualHandSettings() const } const FSGVirtualHandSettings VirtualHandSettings{ - !!VirtualHandSettingsOverrides.bVisibleWhenHandDataUnavailable, + VirtualHandSettingsOverrides.bVisibleWhenHandDataUnavailable, VirtualHandSettingsOverrides.AnimationSettings, VirtualHandSettingsOverrides.DebuggingSettings, VirtualHandSettingsOverrides.GrabSettings, @@ -362,7 +362,7 @@ void USGVirtualHandComponent::UninitializeComponent() const USGGloveTracker* GloveTracker{USGGloveTracker::GetInstance(GetOuter())}; USGHapticGlove* Glove{IsValid(GloveTracker) ? GloveTracker->GetGlove(IsRight()) : nullptr}; - const bool bAutoStopHaptics = !!GetVirtualHandSettings().HapticsSettings.bAutoStopAllHapticsOnEndPlay; + const bool bAutoStopHaptics = GetVirtualHandSettings().HapticsSettings.bAutoStopAllHapticsOnEndPlay; if (IsValid(Glove) && Glove->IsConnected() && bAutoStopHaptics) { Glove->StopHaptics(); @@ -382,7 +382,7 @@ void USGVirtualHandComponent::EndPlay(const EEndPlayReason::Type EndPlayReason) const USGGloveTracker* GloveTracker{USGGloveTracker::GetInstance(GetOuter())}; USGHapticGlove* Glove{IsValid(GloveTracker) ? GloveTracker->GetGlove(IsRight()) : nullptr}; - const bool bAutoStopHaptics = !!GetVirtualHandSettings().HapticsSettings.bAutoStopAllHapticsOnEndPlay; + const bool bAutoStopHaptics = GetVirtualHandSettings().HapticsSettings.bAutoStopAllHapticsOnEndPlay; if (IsValid(Glove) && Glove->IsConnected() && bAutoStopHaptics) { Glove->StopHaptics(); @@ -577,7 +577,7 @@ void USGVirtualHandComponent::FImpl::OverridePluginSettingsPropertyChanged() const FSGVirtualHandSettings& PluginVirtualHandSettings{Settings->GetVirtualHandSettings()}; Owner->VirtualHandSettingsOverrides.bVisibleWhenHandDataUnavailable = - !!PluginVirtualHandSettings.bVisibleWhenHandDataUnavailable; + PluginVirtualHandSettings.bVisibleWhenHandDataUnavailable; Owner->VirtualHandSettingsOverrides.AnimationSettings = PluginVirtualHandSettings.AnimationSettings; Owner->VirtualHandSettingsOverrides.DebuggingSettings = PluginVirtualHandSettings.DebuggingSettings; Owner->VirtualHandSettingsOverrides.GrabSettings = PluginVirtualHandSettings.GrabSettings; @@ -743,7 +743,7 @@ void USGVirtualHandComponent::FImpl::UpdateVisibility() && MotionControllerData.DeviceVisualType == EXRVisualType::Hand; const bool bHandVisible = Owner->IsVisible(); const bool bShouldBeVisibleWhenHandDataUnavailable = - !!Owner->GetVirtualHandSettings().bVisibleWhenHandDataUnavailable; + Owner->GetVirtualHandSettings().bVisibleWhenHandDataUnavailable; bool bSetNewVisibility = false; diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp index 4d0a1501..ee09713b 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGWristTrackerComponent.cpp @@ -226,7 +226,7 @@ void USGWristTrackerComponent::TickComponent( Super::TickComponent(DeltaTime, TickType, ThisTickFunction); - if (!!GetWristTrackingSettings().DebuggingSettings.bDrawDebugWristTracker) + if (GetWristTrackingSettings().DebuggingSettings.bDrawDebugWristTracker) { Pimpl->DrawDebugWristTracker(); } diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h index 232d7c60..e6fad2dd 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h @@ -65,7 +65,7 @@ private: EAttachmentRule AttachmentScaleRule; UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) - uint8 bAttachmentWeldSimulatedBodies : 1; + bool bAttachmentWeldSimulatedBodies; UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) FName AttachmentSocketName; @@ -80,10 +80,10 @@ private: EDetachmentRule DetachmentScaleRule; UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) - uint8 bDetachmentCallModify : 1; + bool bDetachmentCallModify; UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) - uint8 bAffectPhysicsState : 1; + bool bAffectPhysicsState; private: struct FImpl; @@ -129,7 +129,7 @@ public: FORCEINLINE bool GetAttachmentWeldSimulatedBodies() const { - return !!bAttachmentWeldSimulatedBodies; + return bAttachmentWeldSimulatedBodies; } FORCEINLINE void SetAttachmentWeldSimulatedBodies(const bool bInAttachmentWeldSimulatedBodies) @@ -179,7 +179,7 @@ public: FORCEINLINE bool GetDetachmentInCallModify() const { - return !!bDetachmentCallModify; + return bDetachmentCallModify; } FORCEINLINE void SetDetachmentInCallModify(const bool bInDetachmentCallModify) @@ -189,7 +189,7 @@ public: FORCEINLINE bool GetAffectPhysicsState() const { - return !!bAffectPhysicsState; + return bAffectPhysicsState; } FORCEINLINE void SetAffectPhysicsState(const bool bInAffectPhysicsState) diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h index f37f1b16..c0819dfb 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h @@ -95,7 +95,7 @@ private: private: UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) - uint8 bRight : 1; + bool bRight; /** * Overrides the plugin's virtual hand settings. @@ -119,14 +119,14 @@ public: FORCEINLINE bool IsRight() const { - return !!bRight; + return bRight; } void SetRight(const bool bInRight); FORCEINLINE bool OverridesPluginVirtualHandSettings() const { - return !!VirtualHandSettingsOverrides.bOverridePluginSettings; + return VirtualHandSettingsOverrides.bOverridePluginSettings; } FORCEINLINE const FSGVirtualHandSettingsOverrides& GetVirtualHandSettingsOverrides() const diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h index 711390fc..3ad5ee5c 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h @@ -93,7 +93,7 @@ private: private: UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) - uint8 bRight : 1; + bool bRight; /** * Overrides the plugin's wrist tracking settings. @@ -116,14 +116,14 @@ public: FORCEINLINE bool IsRight() const { - return !!bRight; + return bRight; } void SetRight(const bool bInRight); FORCEINLINE bool OverridesPluginWristTrackingSettings() const { - return !!WristTrackingSettingsOverrides.bOverridePluginSettings; + return WristTrackingSettingsOverrides.bOverridePluginSettings; } FORCEINLINE const FSGWristTrackingSettingsOverrides& GetWristTrackingSettingsOverrides() const diff --git a/Source/SenseGloveBackend/Public/SGBackend/SGBackend.h b/Source/SenseGloveBackend/Public/SGBackend/SGBackend.h index 12464469..ec4d59a4 100644 --- a/Source/SenseGloveBackend/Public/SGBackend/SGBackend.h +++ b/Source/SenseGloveBackend/Public/SGBackend/SGBackend.h @@ -51,7 +51,7 @@ class SENSEGLOVEBACKEND_API USGBackend : public UEngineSubsystem private: UPROPERTY(Transient) - uint8 bBackendInitialized : 1; + bool bBackendInitialized; public: static USGBackend* GetInstance(); @@ -73,7 +73,7 @@ public: public: FORCEINLINE bool IsBackendInitialized() const { - return !!bBackendInitialized; + return bBackendInitialized; } bool InitializeBackend(); diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGDebugCubeSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGDebugCubeSettings.h index 31eacb3a..b6b08fd2 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGDebugCubeSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGDebugCubeSettings.h @@ -58,7 +58,7 @@ public: FColor Color; UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Cube") - uint8 bPersistentLines : 1; + bool bPersistentLines; UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Cube") float LifeTimeModifier; diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGDebugGizmoSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGDebugGizmoSettings.h index 0db09f14..7be008ed 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGDebugGizmoSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGDebugGizmoSettings.h @@ -63,7 +63,7 @@ public: FColor ZAxisColor; UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Gizmo") - uint8 bPersistentLines : 1; + bool bPersistentLines; UPROPERTY(Config, EditDefaultsOnly, Category = "Debug Gizmo") float LifeTimeModifier; diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGHandTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGHandTrackingSettings.h index a5d12a64..43266f57 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGHandTrackingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGHandTrackingSettings.h @@ -55,14 +55,14 @@ public: * between motion sources from different device types. */ UPROPERTY(Config, EditDefaultsOnly, Category="Hand Tracking") - uint8 bUseMoreSpecificMotionSourceNames : 1; + bool bUseMoreSpecificMotionSourceNames; /** * If true hand tracking supports the 'Left' and 'Right' legacy motion sources. If false it does not. False is * recommended unless you need legacy compatibility in an older unreal projects. */ UPROPERTY(Config, EditDefaultsOnly, Category="Hand Tracking") - uint8 bSupportLegacyControllerMotionSources : 1; + bool bSupportLegacyControllerMotionSources; public: FSGHandTrackingSettings(); diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGInitializationSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGInitializationSettings.h index 803aa069..b2b9f160 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGInitializationSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGInitializationSettings.h @@ -55,7 +55,7 @@ public: * like this behavior for whatever reason, consider disabling this option. */ UPROPERTY(Config, EditDefaultsOnly, Category="Initialization") - uint8 bValidateIfDefaultClassesAreSGCompliant : 1; + bool bValidateIfDefaultClassesAreSGCompliant; public: FSGInitializationSettings(); diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h index d8a6d07c..7446f2f0 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGTrackingSettings.h @@ -59,7 +59,7 @@ public: * supported by the HMD device. */ UPROPERTY(Config, EditDefaultsOnly, Category="Tracking") - uint8 bFallbackToHandTrackingIfNoGloveDetected : 1; + bool bFallbackToHandTrackingIfNoGloveDetected; UPROPERTY(Config, EditDefaultsOnly, Category="Tracking") FSGGloveTrackingSettings GloveTrackingSettings; diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandAnimationSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandAnimationSettings.h index 8e55ad73..f7aeffb0 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandAnimationSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandAnimationSettings.h @@ -57,7 +57,7 @@ public: FRotator AnimationBoneRotationCorrectionOffset; UPROPERTY(Config, EditDefaultsOnly, Category="Animation") - uint8 bShouldAnimationApplyBoneLocation : 1; + bool bShouldAnimationApplyBoneLocation; public: FSGVirtualHandAnimationSettings(); diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandDebuggingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandDebuggingSettings.h index 0694c812..b26444b9 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandDebuggingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandDebuggingSettings.h @@ -54,7 +54,7 @@ struct SENSEGLOVESETTINGS_API FSGVirtualHandDebuggingSettings public: UPROPERTY(Config, EditDefaultsOnly, Category = "Debugging") - uint8 bDrawDebugVirtualHand : 1; + bool bDrawDebugVirtualHand; UPROPERTY(Config, EditDefaultsOnly, Category = "Debugging", meta=(EditCondition="bDrawDebugVirtualHand", EditConditionHides)) diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandHapticsSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandHapticsSettings.h index 276884ff..15e36562 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandHapticsSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandHapticsSettings.h @@ -52,7 +52,7 @@ struct SENSEGLOVESETTINGS_API FSGVirtualHandHapticsSettings public: UPROPERTY(Config, EditDefaultsOnly, Category="Haptics") - uint8 bAutoStopAllHapticsOnEndPlay : 1; + bool bAutoStopAllHapticsOnEndPlay; public: FSGVirtualHandHapticsSettings(); diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettings.h index f69e98e3..1bcd32eb 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettings.h @@ -57,7 +57,7 @@ struct SENSEGLOVESETTINGS_API FSGVirtualHandSettings public: UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") - uint8 bVisibleWhenHandDataUnavailable : 1; + bool bVisibleWhenHandDataUnavailable; UPROPERTY(Config, EditDefaultsOnly, Category="Virtual Hand") FSGVirtualHandAnimationSettings AnimationSettings; diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettingsOverrides.h b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettingsOverrides.h index e49727b4..6ef651dc 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettingsOverrides.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGVirtualHandSettingsOverrides.h @@ -59,11 +59,11 @@ public: * Determines whether to override the plugin's virtual hand settings or not. */ UPROPERTY(EditAnywhere, Category = "SenseGlove") - uint8 bOverridePluginSettings : 1; + bool bOverridePluginSettings; UPROPERTY(EditAnywhere, Category = "SenseGlove", meta=(EditCondition="bOverridePluginSettings", EditConditionHides)) - uint8 bVisibleWhenHandDataUnavailable : 1; + bool bVisibleWhenHandDataUnavailable; UPROPERTY(EditAnywhere, Category = "SenseGlove", meta=(EditCondition="bOverridePluginSettings", EditConditionHides)) diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingDebuggingSettings.h b/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingDebuggingSettings.h index 638ddbb0..41f370a7 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingDebuggingSettings.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingDebuggingSettings.h @@ -57,7 +57,7 @@ public: * If enabled, draws debug Wrist trackers where possible. */ UPROPERTY(EditAnywhere, Category = "Debugging") - uint8 bDrawDebugWristTracker : 1; + bool bDrawDebugWristTracker; /** * Valid only if bDrawDebugGizmo is enabled. diff --git a/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingSettingsOverrides.h b/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingSettingsOverrides.h index f2ddffc9..3bb27c2e 100644 --- a/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingSettingsOverrides.h +++ b/Source/SenseGloveSettings/Public/SGSettings/SGWristTrackingSettingsOverrides.h @@ -56,7 +56,7 @@ public: * Determines whether to override the plugin's wrist tracking settings or not. */ UPROPERTY(EditAnywhere, Category = "SenseGlove") - uint8 bOverridePluginSettings : 1; + bool bOverridePluginSettings; UPROPERTY(EditAnywhere, Category = "SenseGlove", meta=(EditCondition="bOverridePluginSettings", EditConditionHides)) diff --git a/Source/SenseGloveTracking/Private/SGTracking/SGXRHandState.cpp b/Source/SenseGloveTracking/Private/SGTracking/SGXRHandState.cpp index 58e28342..037f57b1 100644 --- a/Source/SenseGloveTracking/Private/SGTracking/SGXRHandState.cpp +++ b/Source/SenseGloveTracking/Private/SGTracking/SGXRHandState.cpp @@ -60,7 +60,7 @@ bool FSGXRHandState::GetTransform(const EHandKeypoint Keypoint, FTransform& OutT check(static_cast(Keypoint) < EHandKeypointCount); OutTransform = KeypointTransforms[static_cast(Keypoint)]; - return !!bReceivedJointPoses; + return bReceivedJointPoses; } const FTransform& FSGXRHandState::GetTransform(const EHandKeypoint Keypoint) const diff --git a/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp b/Source/SenseGloveTracking/Private/SGTracking/SGXRTracker.cpp index 230089cc..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().bFallbackToHandTrackingIfNoGloveDetected; + Settings->GetTrackingSettings().bFallbackToHandTrackingIfNoGloveDetected; return bFallbackToHandTrackingIfNoGloveDetected; } @@ -117,7 +117,7 @@ struct FSGXRTracker::FImpl const bool bFallbackToHandTrackingIfNoGloveDetected = ShouldFallbackToHandTrackingIfNoGloveDetected(); const bool bUseMoreSpecificMotionSourceNames = bFallbackToHandTrackingIfNoGloveDetected - ? !!Settings->GetTrackingSettings().HandTrackingSettings.bUseMoreSpecificMotionSourceNames + ? Settings->GetTrackingSettings().HandTrackingSettings.bUseMoreSpecificMotionSourceNames : false; return bUseMoreSpecificMotionSourceNames; } @@ -129,7 +129,7 @@ struct FSGXRTracker::FImpl const bool bFallbackToHandTrackingIfNoGloveDetected = ShouldFallbackToHandTrackingIfNoGloveDetected(); const bool bSupportLegacyControllerMotionSources = bFallbackToHandTrackingIfNoGloveDetected - ? !!Settings->GetTrackingSettings().HandTrackingSettings.bSupportLegacyControllerMotionSources + ? Settings->GetTrackingSettings().HandTrackingSettings.bSupportLegacyControllerMotionSources : false; return bSupportLegacyControllerMotionSources; } @@ -591,7 +591,7 @@ struct FSGXRTracker::FImpl * Member variables ************************/ - uint8 bHandTrackingAvailable : 1; + bool bHandTrackingAvailable; PFN_xrCreateHandTrackerEXT XRCreateHandTrackerEXT; PFN_xrDestroyHandTrackerEXT XRDestroyHandTrackerEXT; @@ -1225,7 +1225,7 @@ bool FSGXRTracker::IsHandTrackingSupportedByDevice() const const bool bFallbackToHandTrackingIfNoGloveDetected = FImpl::ShouldFallbackToHandTrackingIfNoGloveDetected(); const bool bAnyGloveConnected = FImpl::IsAnyGloveConnected(); - const bool bHandTrackingAvailable = !!Pimpl->bHandTrackingAvailable; + const bool bHandTrackingAvailable = Pimpl->bHandTrackingAvailable; const bool bHandTrackingSupportedByDevice = bAnyGloveConnected || (bFallbackToHandTrackingIfNoGloveDetected && bHandTrackingAvailable); @@ -1301,7 +1301,7 @@ const void* FSGXRTracker::OnCreateSession(const XrInstance InInstance, const XrS const void* FSGXRTracker::OnBeginSession(const XrSession InSession, const void* InNext) { - const bool bHandTrackingAvailable = !!Pimpl->bHandTrackingAvailable; + const bool bHandTrackingAvailable = Pimpl->bHandTrackingAvailable; if (bHandTrackingAvailable) { @@ -1462,7 +1462,7 @@ ETrackingStatus FSGXRTracker::GetControllerTrackingStatus(const int32 Controller if (bFallbackToHandTrackingIfNoGloveDetected) { const FSGXRHandState& HandState{bRight ? GetRightHandState() : GetLeftHandState()}; - return !!HandState.bReceivedJointPoses ? ETrackingStatus::Tracked : ETrackingStatus::NotTracked; + return HandState.bReceivedJointPoses ? ETrackingStatus::Tracked : ETrackingStatus::NotTracked; } return ETrackingStatus::NotTracked; @@ -1545,7 +1545,7 @@ bool FSGXRTracker::IsHandTrackingStateValid() const { const bool bFallbackToHandTrackingIfNoGloveDetected = FImpl::ShouldFallbackToHandTrackingIfNoGloveDetected(); - const bool bHandTrackingAvailable = !!Pimpl->bHandTrackingAvailable; + const bool bHandTrackingAvailable = Pimpl->bHandTrackingAvailable; const bool bAnyGloveConnected = FImpl::IsAnyGloveConnected(); const bool bHandTrackingStateValid = @@ -1717,7 +1717,7 @@ bool FSGXRTracker::FImpl::CanOutputTrackingData(const EControllerHand Hand) cons { const bool bFallbackToHandTrackingIfNoGloveDetected = ShouldFallbackToHandTrackingIfNoGloveDetected(); - const bool bIsHandTrackingAvailable = !!bHandTrackingAvailable; + const bool bIsHandTrackingAvailable = bHandTrackingAvailable; bool bGloveConnected = false; if (Hand == EControllerHand::Left) diff --git a/Source/SenseGloveTracking/Public/SGTracking/SGXRHandState.h b/Source/SenseGloveTracking/Public/SGTracking/SGXRHandState.h index b5ffb46e..66378d7a 100644 --- a/Source/SenseGloveTracking/Public/SGTracking/SGXRHandState.h +++ b/Source/SenseGloveTracking/Public/SGTracking/SGXRHandState.h @@ -56,7 +56,7 @@ public: float Radii[EHandKeypointCount]; - uint8 bReceivedJointPoses : 1; + bool bReceivedJointPoses; public: FSGXRHandState();