From fbadae50afd704452356805983b5246f2644f604 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Mon, 8 May 2023 13:59:14 +0200 Subject: [PATCH] expose the connected glove in the virtual hand's api --- .../Public/SenseGlove/Components/SGVirtualHandComponent.h | 6 ++++++ .../SGKismet/SGVirtualHandComponentKismetLibrary.cpp | 6 ++++++ .../Public/SGKismet/SGVirtualHandComponentKismetLibrary.h | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h index a1082e34..4330f4a1 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGVirtualHandComponent.h @@ -287,6 +287,12 @@ protected: public: bool IsGloveConnected() const; + + FORCEINLINE USGHapticGlove* GetConnectedGlove() const + { + return Glove; + } + USGHandPose* GetHandPose(); public: diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp index 5291fc86..eaef3f75 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGVirtualHandComponentKismetLibrary.cpp @@ -37,6 +37,7 @@ #include "SenseGlove/Components/SGVirtualHandComponent.h" #include "SGCore/SGHandPose.h" +#include "SGCore/SGHapticGlove.h" #include "SGUtils/SGArrayUtils.h" TArray UVirtualHandComponentKismetLibrary::GetLeftHandFingerBoneNames() @@ -208,6 +209,11 @@ bool UVirtualHandComponentKismetLibrary::IsGloveConnected(const USGVirtualHandCo return VirtualHandComponent->IsGloveConnected(); } +USGHapticGlove* UVirtualHandComponentKismetLibrary::GetConnectedGlove(const USGVirtualHandComponent* VirtualHandComponent) +{ + return VirtualHandComponent->GetConnectedGlove(); +} + USGHandPose* UVirtualHandComponentKismetLibrary::GetHandPose(USGVirtualHandComponent* VirtualHandComponent) { return VirtualHandComponent->GetHandPose(); diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h index 3dfc3acb..2463eede 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGVirtualHandComponentKismetLibrary.h @@ -52,6 +52,7 @@ class USkeletalMeshComponent; class USGVirtualHandComponent; class USGHandPose; +class USGHapticGlove; UCLASS(meta=(ScriptName = "SesneGloveVirtualHandComponentKismetLibrary")) class SENSEGLOVEKISMET_API UVirtualHandComponentKismetLibrary final : public USGBlueprintFunctionLibrary @@ -155,6 +156,9 @@ public: UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component") static bool IsGloveConnected(const USGVirtualHandComponent* VirtualHandComponent); + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Virtual Hand Component") + static USGHapticGlove* GetConnectedGlove(const USGVirtualHandComponent* VirtualHandComponent); + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Virtual Hand Component") static USGHandPose* GetHandPose(UPARAM(ref) USGVirtualHandComponent* VirtualHandComponent);