From 8934da2dc709d97ddd8ef062d8c47d53acf2dbf7 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Thu, 4 May 2023 20:39:13 +0200 Subject: [PATCH] move force-feedback properties from the touch component to the grab component --- .../SenseGlove/Components/SGGrabComponent.cpp | 6 ++ .../Components/SGTouchComponent.cpp | 6 -- .../SenseGlove/Components/SGGrabComponent.h | 70 +++++++++++++++++++ .../SenseGlove/Components/SGTouchComponent.h | 70 ------------------- .../SGKismet/SGGrabComponentKismetLibrary.cpp | 50 +++++++++++++ .../SGTouchComponentKismetLibrary.cpp | 50 ------------- .../SGKismet/SGGrabComponentKismetLibrary.h | 30 ++++++++ .../SGKismet/SGTouchComponentKismetLibrary.h | 30 -------- 8 files changed, 156 insertions(+), 156 deletions(-) diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGGrabComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGGrabComponent.cpp index d5cd61ee..75e82633 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGGrabComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGGrabComponent.cpp @@ -93,6 +93,12 @@ USGGrabComponent::USGGrabComponent(const FObjectInitializer& ObjectInitializer) bAttachmentWeldSimulatedBodies = false; AttachmentSocketName = NAME_None; + + ThumbForceFeedbackLevel = 100; + IndexForceFeedbackLevel = 100; + MiddleForceFeedbackLevel = 100; + RingForceFeedbackLevel = 100; + PinkyForceFeedbackLevel = 100; } USGGrabComponent::FImpl::FImpl(USGGrabComponent* InOwner) diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp index 64e1b452..3d5762e3 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp @@ -92,12 +92,6 @@ USGTouchComponent::USGTouchComponent(const FObjectInitializer& ObjectInitializer MiddleBuzzLevel = 0; RingBuzzLevel = 0; PinkyBuzzLevel = 0; - - ThumbForceFeedbackLevel = 100; - IndexForceFeedbackLevel = 100; - MiddleForceFeedbackLevel = 100; - RingForceFeedbackLevel = 100; - PinkyForceFeedbackLevel = 100; } USGTouchComponent::FImpl::FImpl(USGTouchComponent* InOwner) diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h index 3028c228..6427d1c6 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGGrabComponent.h @@ -68,6 +68,26 @@ private: UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false")) FName AttachmentSocketName; + UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + int32 ThumbForceFeedbackLevel; + + UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + int32 IndexForceFeedbackLevel; + + UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + int32 MiddleForceFeedbackLevel; + + UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + int32 RingForceFeedbackLevel; + + UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + int32 PinkyForceFeedbackLevel; + private: struct FImpl; @@ -129,4 +149,54 @@ public: { AttachmentSocketName = InAttachmentSocketName; } + + FORCEINLINE int32 GetThumbForceFeedbackLevel() const + { + return ThumbForceFeedbackLevel; + } + + FORCEINLINE void SetThumbForceFeedbackLevel(const int32 Level) + { + ThumbForceFeedbackLevel = Level; + } + + FORCEINLINE int32 GetIndexForceFeedbackLevel() const + { + return IndexForceFeedbackLevel; + } + + FORCEINLINE void SetIndexForceFeedbackLevel(const int32 Level) + { + IndexForceFeedbackLevel = Level; + } + + FORCEINLINE int32 GetMiddleForceFeedbackLevel() const + { + return MiddleForceFeedbackLevel; + } + + FORCEINLINE void SetMiddleForceFeedbackLevel(const int32 Level) + { + MiddleForceFeedbackLevel = Level; + } + + FORCEINLINE int32 GetRingForceFeedbackLevel() const + { + return RingForceFeedbackLevel; + } + + FORCEINLINE void SetRingForceFeedbackLevel(const int32 Level) + { + RingForceFeedbackLevel = Level; + } + + FORCEINLINE int32 GetPinkyForceFeedbackLevel() const + { + return PinkyForceFeedbackLevel; + } + + FORCEINLINE void SetPinkyForceFeedbackLevel(const int32 Level) + { + PinkyForceFeedbackLevel = Level; + } }; \ No newline at end of file diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h index ab32fbb2..ad928b1f 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h @@ -71,26 +71,6 @@ private: meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) int32 PinkyBuzzLevel; - UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", - meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) - int32 ThumbForceFeedbackLevel; - - UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", - meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) - int32 IndexForceFeedbackLevel; - - UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", - meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) - int32 MiddleForceFeedbackLevel; - - UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", - meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) - int32 RingForceFeedbackLevel; - - UPROPERTY(EditAnywhere, Category="SenseGlove | Force Feedback Level", - meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) - int32 PinkyForceFeedbackLevel; - private: struct FImpl; @@ -152,54 +132,4 @@ public: { PinkyBuzzLevel = Level; } - - FORCEINLINE int32 GetThumbForceFeedbackLevel() const - { - return ThumbForceFeedbackLevel; - } - - FORCEINLINE void SetThumbForceFeedbackLevel(const int32 Level) - { - ThumbForceFeedbackLevel = Level; - } - - FORCEINLINE int32 GetIndexForceFeedbackLevel() const - { - return IndexForceFeedbackLevel; - } - - FORCEINLINE void SetIndexForceFeedbackLevel(const int32 Level) - { - IndexForceFeedbackLevel = Level; - } - - FORCEINLINE int32 GetMiddleForceFeedbackLevel() const - { - return MiddleForceFeedbackLevel; - } - - FORCEINLINE void SetMiddleForceFeedbackLevel(const int32 Level) - { - MiddleForceFeedbackLevel = Level; - } - - FORCEINLINE int32 GetRingForceFeedbackLevel() const - { - return RingForceFeedbackLevel; - } - - FORCEINLINE void SetRingForceFeedbackLevel(const int32 Level) - { - RingForceFeedbackLevel = Level; - } - - FORCEINLINE int32 GetPinkyForceFeedbackLevel() const - { - return PinkyForceFeedbackLevel; - } - - FORCEINLINE void SetPinkyForceFeedbackLevel(const int32 Level) - { - PinkyForceFeedbackLevel = Level; - } }; \ No newline at end of file diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGGrabComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGGrabComponentKismetLibrary.cpp index a04b05b9..0100a27f 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGGrabComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGGrabComponentKismetLibrary.cpp @@ -97,4 +97,54 @@ void UGrabComponentKismetLibrary::SetAttachmentSocketName(USGGrabComponent* Grab const FName& InAttachmentSocketName) { GrabComponent->SetAttachmentSocketName(InAttachmentSocketName); +} + +int32 UGrabComponentKismetLibrary::GetThumbForceFeedbackLevel(const USGGrabComponent* GrabComponent) +{ + return GrabComponent->GetThumbForceFeedbackLevel(); +} + +void UGrabComponentKismetLibrary::SetThumbForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level) +{ + GrabComponent->SetThumbForceFeedbackLevel(Level); +} + +int32 UGrabComponentKismetLibrary::GetIndexForceFeedbackLevel(const USGGrabComponent* GrabComponent) +{ + return GrabComponent->GetIndexForceFeedbackLevel(); +} + +void UGrabComponentKismetLibrary::SetIndexForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level) +{ + GrabComponent->SetIndexForceFeedbackLevel(Level); +} + +int32 UGrabComponentKismetLibrary::GetMiddleForceFeedbackLevel(const USGGrabComponent* GrabComponent) +{ + return GrabComponent->GetMiddleForceFeedbackLevel(); +} + +void UGrabComponentKismetLibrary::SetMiddleForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level) +{ + GrabComponent->SetMiddleForceFeedbackLevel(Level); +} + +int32 UGrabComponentKismetLibrary::GetRingForceFeedbackLevel(const USGGrabComponent* GrabComponent) +{ + return GrabComponent->GetRingForceFeedbackLevel(); +} + +void UGrabComponentKismetLibrary::SetRingForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level) +{ + GrabComponent->SetRingForceFeedbackLevel(Level); +} + +int32 UGrabComponentKismetLibrary::GetPinkyForceFeedbackLevel(const USGGrabComponent* GrabComponent) +{ + return GrabComponent->GetPinkyForceFeedbackLevel(); +} + +void UGrabComponentKismetLibrary::SetPinkyForceFeedbackLevel(USGGrabComponent* GrabComponent, const int32 Level) +{ + GrabComponent->SetPinkyForceFeedbackLevel(Level); } \ No newline at end of file diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp index ac738145..6e2e8dab 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp @@ -93,54 +93,4 @@ int32 UTouchComponentKismetLibrary::GetPinkyBuzzLevel(const USGTouchComponent* T void UTouchComponentKismetLibrary::SetPinkyBuzzLevel(USGTouchComponent* TouchComponent, const int32 Level) { TouchComponent->SetPinkyBuzzLevel(Level); -} - -int32 UTouchComponentKismetLibrary::GetThumbForceFeedbackLevel(const USGTouchComponent* TouchComponent) -{ - return TouchComponent->GetThumbForceFeedbackLevel(); -} - -void UTouchComponentKismetLibrary::SetThumbForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level) -{ - TouchComponent->SetThumbForceFeedbackLevel(Level); -} - -int32 UTouchComponentKismetLibrary::GetIndexForceFeedbackLevel(const USGTouchComponent* TouchComponent) -{ - return TouchComponent->GetIndexForceFeedbackLevel(); -} - -void UTouchComponentKismetLibrary::SetIndexForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level) -{ - TouchComponent->SetIndexForceFeedbackLevel(Level); -} - -int32 UTouchComponentKismetLibrary::GetMiddleForceFeedbackLevel(const USGTouchComponent* TouchComponent) -{ - return TouchComponent->GetMiddleForceFeedbackLevel(); -} - -void UTouchComponentKismetLibrary::SetMiddleForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level) -{ - TouchComponent->SetMiddleForceFeedbackLevel(Level); -} - -int32 UTouchComponentKismetLibrary::GetRingForceFeedbackLevel(const USGTouchComponent* TouchComponent) -{ - return TouchComponent->GetRingForceFeedbackLevel(); -} - -void UTouchComponentKismetLibrary::SetRingForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level) -{ - TouchComponent->SetRingForceFeedbackLevel(Level); -} - -int32 UTouchComponentKismetLibrary::GetPinkyForceFeedbackLevel(const USGTouchComponent* TouchComponent) -{ - return TouchComponent->GetPinkyForceFeedbackLevel(); -} - -void UTouchComponentKismetLibrary::SetPinkyForceFeedbackLevel(USGTouchComponent* TouchComponent, const int32 Level) -{ - TouchComponent->SetPinkyForceFeedbackLevel(Level); } \ No newline at end of file diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGGrabComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGGrabComponentKismetLibrary.h index 618648e7..d3edc487 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGGrabComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGGrabComponentKismetLibrary.h @@ -87,4 +87,34 @@ public: UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") static void SetAttachmentSocketName(UPARAM(ref) USGGrabComponent* GrabComponent, const FName& InAttachmentSocketName); + + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component") + static int32 GetThumbForceFeedbackLevel(const USGGrabComponent* GrabComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") + static void SetThumbForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level); + + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component") + static int32 GetIndexForceFeedbackLevel(const USGGrabComponent* GrabComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") + static void SetIndexForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level); + + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component") + static int32 GetMiddleForceFeedbackLevel(const USGGrabComponent* GrabComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") + static void SetMiddleForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level); + + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component") + static int32 GetRingForceFeedbackLevel(const USGGrabComponent* GrabComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") + static void SetRingForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level); + + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Grab Component") + static int32 GetPinkyForceFeedbackLevel(const USGGrabComponent* GrabComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Grab Component") + static void SetPinkyForceFeedbackLevel(UPARAM(ref) USGGrabComponent* GrabComponent, int32 Level); }; \ No newline at end of file diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h index 44619d03..546e088c 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h @@ -82,34 +82,4 @@ public: UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") static void SetPinkyBuzzLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); - - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") - static int32 GetThumbForceFeedbackLevel(const USGTouchComponent* TouchComponent); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") - static void SetThumbForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); - - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") - static int32 GetIndexForceFeedbackLevel(const USGTouchComponent* TouchComponent); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") - static void SetIndexForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); - - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") - static int32 GetMiddleForceFeedbackLevel(const USGTouchComponent* TouchComponent); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") - static void SetMiddleForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); - - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") - static int32 GetRingForceFeedbackLevel(const USGTouchComponent* TouchComponent); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") - static void SetRingForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); - - UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") - static int32 GetPinkyForceFeedbackLevel(const USGTouchComponent* TouchComponent); - - UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") - static void SetPinkyForceFeedbackLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); }; \ No newline at end of file