diff --git a/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp b/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp index 7f2eb62d..ea5eb3ee 100644 --- a/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp +++ b/Source/SenseGlove/Private/SenseGlove/Components/SGTouchComponent.cpp @@ -88,6 +88,8 @@ USGTouchComponent::USGTouchComponent(const FObjectInitializer& ObjectInitializer Pimpl(TUniquePtr(new FImpl{this}, PimplDeleter)) { BuzzLevel = 0; + BuzzDuration = 0.25f; + ForceFeedbackLevel = 100; } diff --git a/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h b/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h index f73f4194..cd5cc2bb 100644 --- a/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h +++ b/Source/SenseGlove/Public/SenseGlove/Components/SGTouchComponent.h @@ -55,6 +55,10 @@ private: meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) int32 BuzzLevel; + UPROPERTY(EditAnywhere, Category="SenseGlove", + meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) + float BuzzDuration; + UPROPERTY(EditAnywhere, Category="SenseGlove", meta=(AllowPrivateAccess="false", ClampMin = "0", ClampMax = "100", UIMin = "0", UIMax = "100")) int32 ForceFeedbackLevel; @@ -81,6 +85,16 @@ public: BuzzLevel = Level; } + FORCEINLINE float GetBuzzDuration() const + { + return BuzzDuration; + } + + FORCEINLINE void SetBuzzDuration(const float Duration) + { + BuzzDuration = Duration; + } + FORCEINLINE int32 GetForceFeedbackLevel() const { return ForceFeedbackLevel; diff --git a/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp b/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp index ab33fee9..71606346 100644 --- a/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp +++ b/Source/SenseGloveKismet/Private/SGKismet/SGTouchComponentKismetLibrary.cpp @@ -55,6 +55,16 @@ void UTouchComponentKismetLibrary::SetBuzzLevel(USGTouchComponent* TouchComponen TouchComponent->SetBuzzLevel(Level); } +float UTouchComponentKismetLibrary::GetBuzzDuration(const USGTouchComponent* TouchComponent) +{ + return TouchComponent->GetBuzzDuration(); +} + +void UTouchComponentKismetLibrary::SetBuzzDuration(USGTouchComponent* TouchComponent, const float Duration) +{ + TouchComponent->SetBuzzDuration(Duration); +} + int32 UTouchComponentKismetLibrary::GetForceFeedbackLevel(const USGTouchComponent* TouchComponent) { return TouchComponent->GetForceFeedbackLevel(); diff --git a/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h b/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h index 84ca69ec..a3e0a1c3 100644 --- a/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h +++ b/Source/SenseGloveKismet/Public/SGKismet/SGTouchComponentKismetLibrary.h @@ -59,6 +59,12 @@ public: UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") static void SetBuzzLevel(UPARAM(ref) USGTouchComponent* TouchComponent, int32 Level); + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") + static float GetBuzzDuration(const USGTouchComponent* TouchComponent); + + UFUNCTION(BlueprintCallable, Category="SenseGlove | Components | Touch Component") + static void SetBuzzDuration(UPARAM(ref) USGTouchComponent* TouchComponent, float Duration); + UFUNCTION(BlueprintPure, Category="SenseGlove | Components | Touch Component") static int32 GetForceFeedbackLevel(const USGTouchComponent* TouchComponent);