diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h index 4ed53727..4ec345a3 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h @@ -177,7 +177,6 @@ public: bool IsGloveConnected() const; USGHapticGlove* GetConnectedGlove() const; - UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState") bool GetMotionControllerData(FXRMotionControllerData& OutMotionControllerData); #if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5 diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h index fc5e0ebe..2275d6b5 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGWristTrackerComponent.h @@ -165,7 +165,6 @@ protected: FActorComponentTickFunction* ThisTickFunction); public: - UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState") bool GetMotionControllerData(FXRMotionControllerData& OutMotionControllerData); #if ENGINE_MAJOR_VERSION >= 5 && ENGINE_MINOR_VERSION >= 5 diff --git a/Source/SenseGloveDebug/Public/SGDebug/SGDebugVirtualHand.h b/Source/SenseGloveDebug/Public/SGDebug/SGDebugVirtualHand.h index 9b8d1810..f2a41f03 100644 --- a/Source/SenseGloveDebug/Public/SGDebug/SGDebugVirtualHand.h +++ b/Source/SenseGloveDebug/Public/SGDebug/SGDebugVirtualHand.h @@ -48,7 +48,6 @@ class UWorld; class SENSEGLOVEDEBUG_API FSGDebugVirtualHand final { public: - UE_DEPRECATED(5.5, "Deprecated in favor of the variant that accepts FXRHandTrackingState") static void Draw( const UWorld* World, const FXRMotionControllerData& MotionControllerData, diff --git a/Source/SenseGloveDebugKismet/Private/SGDebugKismet/SGDebugVirtualHandKismetLibrary.cpp b/Source/SenseGloveDebugKismet/Private/SGDebugKismet/SGDebugVirtualHandKismetLibrary.cpp index 8545d148..df9a0210 100644 --- a/Source/SenseGloveDebugKismet/Private/SGDebugKismet/SGDebugVirtualHandKismetLibrary.cpp +++ b/Source/SenseGloveDebugKismet/Private/SGDebugKismet/SGDebugVirtualHandKismetLibrary.cpp @@ -47,14 +47,4 @@ void USGDebugVirtualHandKismetLibrary::Draw_FXRMotionControllerData( PRAGMA_DISABLE_DEPRECATION_WARNINGS FSGDebugVirtualHand::Draw(WorldContextObject->GetWorld(), MotionControllerData, Settings); PRAGMA_ENABLE_DEPRECATION_WARNINGS -} - -void USGDebugVirtualHandKismetLibrary::Draw_FXRHandTrackingState( - UObject* WorldContextObject, - const FXRHandTrackingState& HandTrackingState, - const FSGVirtualHandDebuggingSettings& Settings) -{ - ensureAlwaysMsgf(WorldContextObject, TEXT("Invalid world context object!")); - - FSGDebugVirtualHand::Draw(WorldContextObject->GetWorld(), HandTrackingState, Settings); } \ No newline at end of file diff --git a/Source/SenseGloveDebugKismet/Public/SGDebugKismet/SGDebugVirtualHandKismetLibrary.h b/Source/SenseGloveDebugKismet/Public/SGDebugKismet/SGDebugVirtualHandKismetLibrary.h index ede3c809..95797375 100644 --- a/Source/SenseGloveDebugKismet/Public/SGDebugKismet/SGDebugVirtualHandKismetLibrary.h +++ b/Source/SenseGloveDebugKismet/Public/SGDebugKismet/SGDebugVirtualHandKismetLibrary.h @@ -56,11 +56,4 @@ public: UObject* WorldContextObject, const FXRMotionControllerData& MotionControllerData, const FSGVirtualHandDebuggingSettings& Settings); - - UFUNCTION(BlueprintCallable, DisplayName="Draw", Category="SenseGlove | Debug | Virtual Hand", - meta=(WorldContext="WorldContextObject")) - static void Draw_FXRHandTrackingState( - UObject* WorldContextObject, - const FXRHandTrackingState& HandTrackingState, - const FSGVirtualHandDebuggingSettings& Settings); }; \ No newline at end of file diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp index 49c99877..07d0dee3 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp @@ -118,20 +118,6 @@ bool UVirtualHandComponentKismetLibrary::GetMotionControllerData( PRAGMA_ENABLE_DEPRECATION_WARNINGS } -bool UVirtualHandComponentKismetLibrary::GetMotionControllerState(USGVirtualHandComponent* VirtualHandComponent, - const EXRSpaceType XRSpaceType, const EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState) -{ - return VirtualHandComponent->GetMotionControllerState( - XRSpaceType, XRControllerPoseType, OutMotionControllerState); -} - -bool UVirtualHandComponentKismetLibrary::GetHandTrackingState(USGVirtualHandComponent* VirtualHandComponent, - const EXRSpaceType XRSpaceType, FXRHandTrackingState& OutHandTrackingState) -{ - return VirtualHandComponent->GetHandTrackingState(XRSpaceType, OutHandTrackingState); -} - const TArray& UVirtualHandComponentKismetLibrary::GetHandBoneNames( const USGVirtualHandComponent* VirtualHandComponent) { diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp index 33339adc..c55d2a2e 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGWristTrackerComponentKismetLibrary.cpp @@ -96,21 +96,4 @@ bool UWristTrackerComponentKismetLibrary::GetMotionControllerData( PRAGMA_DISABLE_DEPRECATION_WARNINGS return WristTrackerComponent->GetMotionControllerData(OutMotionControllerData); PRAGMA_ENABLE_DEPRECATION_WARNINGS -} - -bool UWristTrackerComponentKismetLibrary::GetMotionControllerState( - USGWristTrackerComponent* WristTrackerComponent, - const EXRSpaceType XRSpaceType, const EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState) -{ - return WristTrackerComponent->GetMotionControllerState( - XRSpaceType, XRControllerPoseType, OutMotionControllerState); -} - -bool UWristTrackerComponentKismetLibrary::GetHandTrackingState( - USGWristTrackerComponent* WristTrackerComponent, - const EXRSpaceType XRSpaceType, FXRHandTrackingState& OutHandTrackingState) -{ - return WristTrackerComponent->GetHandTrackingState( - XRSpaceType, OutHandTrackingState); } \ No newline at end of file diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h index f83d7068..6906c194 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h @@ -106,16 +106,6 @@ public: static bool GetMotionControllerData(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent, FXRMotionControllerData& OutMotionControllerData); - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component") - static bool GetMotionControllerState(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent, - EXRSpaceType XRSpaceType, EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component") - static bool GetHandTrackingState(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent, - EXRSpaceType XRSpaceType, - FXRHandTrackingState& OutHandTrackingState); - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component") static const TArray& GetHandBoneNames(const USGVirtualHandComponent* VirtualHandComponent); diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h index e2540b7c..91b3e827 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGWristTrackerComponentKismetLibrary.h @@ -86,14 +86,4 @@ public: UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component") static bool GetMotionControllerData(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent, FXRMotionControllerData& OutMotionControllerData); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component") - static bool GetMotionControllerState(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent, - EXRSpaceType XRSpaceType, EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Wrist Tracker Component") - static bool GetHandTrackingState(UPARAM(ref) USGWristTrackerComponent* WristTrackerComponent, - EXRSpaceType XRSpaceType, - FXRHandTrackingState& OutHandTrackingState); }; \ No newline at end of file diff --git a/Source/SenseGloveTracking/Public/SGTracking/SGXRTracker.h b/Source/SenseGloveTracking/Public/SGTracking/SGXRTracker.h index c35a5f06..d1d7a870 100644 --- a/Source/SenseGloveTracking/Public/SGTracking/SGXRTracker.h +++ b/Source/SenseGloveTracking/Public/SGTracking/SGXRTracker.h @@ -55,7 +55,6 @@ class SENSEGLOVETRACKING_API FSGXRTracker final : public IOpenXRExtensionPlugin, public IHandTracker { public: - UE_DEPRECATED(5.5, "Deprecated by UE 5.5 in favor of GetMotionControllerState and GetHandTrackingState") static bool GetMotionControllerData( UObject* WorldContextObject, EControllerHand Hand, diff --git a/Source/SenseGloveTrackingKismet/Private/SGTrackingKismet/SGXRTrackerKismetLibrary.cpp b/Source/SenseGloveTrackingKismet/Private/SGTrackingKismet/SGXRTrackerKismetLibrary.cpp index d98a71c2..a31b28da 100644 --- a/Source/SenseGloveTrackingKismet/Private/SGTrackingKismet/SGXRTrackerKismetLibrary.cpp +++ b/Source/SenseGloveTrackingKismet/Private/SGTrackingKismet/SGXRTrackerKismetLibrary.cpp @@ -45,21 +45,4 @@ bool USGXRTrackerKismetLibrary::GetMotionControllerData( PRAGMA_DISABLE_DEPRECATION_WARNINGS return FSGXRTracker::GetMotionControllerData(WorldContextObject, Hand, OutMotionControllerData); PRAGMA_ENABLE_DEPRECATION_WARNINGS -} - -bool USGXRTrackerKismetLibrary::GetMotionControllerState( - UObject* WorldContextObject, - const EXRSpaceType XRSpaceType, const EControllerHand Hand, const EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState) -{ - return FSGXRTracker::GetMotionControllerState( - WorldContextObject, XRSpaceType, Hand, XRControllerPoseType, OutMotionControllerState); -} - -bool USGXRTrackerKismetLibrary::GetHandTrackingState( - UObject* WorldContextObject, - const EXRSpaceType XRSpaceType, const EControllerHand Hand, - FXRHandTrackingState& OutHandTrackingState) -{ - return FSGXRTracker::GetHandTrackingState(WorldContextObject, XRSpaceType, Hand, OutHandTrackingState); } \ No newline at end of file diff --git a/Source/SenseGloveTrackingKismet/Public/SGTrackingKismet/SGXRTrackerKismetLibrary.h b/Source/SenseGloveTrackingKismet/Public/SGTrackingKismet/SGXRTrackerKismetLibrary.h index b6d5b065..9540f955 100644 --- a/Source/SenseGloveTrackingKismet/Public/SGTrackingKismet/SGXRTrackerKismetLibrary.h +++ b/Source/SenseGloveTrackingKismet/Public/SGTrackingKismet/SGXRTrackerKismetLibrary.h @@ -57,18 +57,4 @@ public: UObject* WorldContextObject, EControllerHand Hand, FXRMotionControllerData& OutMotionControllerData); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Tracking | XR Tracker", - meta=(WorldContext="WorldContextObject")) - static bool GetMotionControllerState( - UObject* WorldContextObject, - EXRSpaceType XRSpaceType, EControllerHand Hand, EXRControllerPoseType XRControllerPoseType, - FXRMotionControllerState& OutMotionControllerState); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Tracking | XR Tracker", - meta=(WorldContext="WorldContextObject")) - static bool GetHandTrackingState( - UObject* WorldContextObject, - EXRSpaceType XRSpaceType, EControllerHand Hand, - FXRHandTrackingState& OutHandTrackingState); }; \ No newline at end of file