clean up and simplify the touch callback lambda

2023-05-19 18:13:58 +02:00
parent e98abc7873
commit c466451b9a
1 changed files with 73 additions and 57 deletions
@@ -93,12 +93,19 @@ struct ASGPlayerController::FImpl
     * Methods
     ************************/

-    USGBuzzCommand* GetBuzzCommand(const AActor* ActorThumbTouching, const AActor* ActorIndexTouching,
+    USGBuzzCommand* GetBuzzCommand(
+        const AActor* ActorThumbTouching, const AActor* ActorIndexTouching,
        const AActor* ActorMiddleTouching, const AActor* ActorRingTouching,
        const AActor* ActorPinkyTouching) const;
-    USGForceFeedbackCommand* GetForceFeedbackCommand(const AActor* ActorThumbTouching, const AActor* ActorIndexTouching,
+    USGForceFeedbackCommand* GetForceFeedbackCommand(
+        const AActor* ActorThumbTouching, const AActor* ActorIndexTouching,
        const AActor* ActorMiddleTouching, const AActor* ActorRingTouching,
        const AActor* ActorPinkyTouching) const;
+
+    void UpdateHapticsFeedback(
+        const USGVirtualHandComponent* Hand,
+        const AActor* ActorThumbTouching, const AActor* ActorIndexTouching, const AActor* ActorMiddleTouching,
+        const AActor* ActorRingTouching, const AActor* ActorPinkyTouching);
 };

 int32 ASGPlayerController::FImpl::GetBuzzLevel(const AActor* Actor)
@@ -236,57 +243,9 @@ void ASGPlayerController::BeginPlay()
        const AActor* ActorThumbTouching, const AActor* ActorIndexTouching, const AActor* ActorMiddleTouching,
        const AActor* ActorRingTouching, const AActor* ActorPinkyTouching) -> void
        {
-            if (!IsValid(SGPawn))
-            {
-                return;
-            }
-
-            if (!IsValid(Hand))
-            {
-                return;
-            }
-
-            USGHapticGlove* Glove = Hand->GetConnectedGlove();
-            if (!IsValid(Glove))
-            {
-                return;
-            }
-
-            const USGBuzzCommand* BuzzCommand{Pimpl->GetBuzzCommand(
-                ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching)};
-            if (IsValid(BuzzCommand))
-            {
-                Glove->SendHaptics(BuzzCommand);
-
-                const float Duration = FImpl::GetBuzzDuration(
+            Pimpl->UpdateHapticsFeedback(
+                Hand,
                ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching);
-
-                GetWorldTimerManager().ClearTimer(Pimpl->TouchBuzzStopTimer);
-
-                FTimerDelegate TouchBuzzStopHandler;
-                TouchBuzzStopHandler.BindLambda([=]()-> void
-                {
-                    Glove->SendHaptics(USGBuzzCommand::Off(this));
-                });
-
-                GetWorldTimerManager().SetTimer(
-                    Pimpl->TouchBuzzStopTimer, TouchBuzzStopHandler, Duration, false, -1.0f);
-            }
-            else
-            {
-                Glove->SendHaptics(USGBuzzCommand::Off(this));
-            }
-
-            const USGForceFeedbackCommand* ForceFeedbackCommand{Pimpl->GetForceFeedbackCommand(
-                ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching)};
-            if (IsValid(ForceFeedbackCommand))
-            {
-                Glove->SendHaptics(ForceFeedbackCommand);
-            }
-            else
-            {
-                Glove->SendHaptics(USGForceFeedbackCommand::Off(this));
-            }
        });
 }

@@ -358,6 +317,63 @@ USGForceFeedbackCommand* ASGPlayerController::FImpl::GetForceFeedbackCommand(
    return ForceFeedbackCommand;
 }

+void ASGPlayerController::FImpl::UpdateHapticsFeedback(
+    const USGVirtualHandComponent* Hand,
+    const AActor* ActorThumbTouching, const AActor* ActorIndexTouching, const AActor* ActorMiddleTouching,
+    const AActor* ActorRingTouching, const AActor* ActorPinkyTouching)
+{
+    if (!IsValid(Hand))
+    {
+        return;
+    }
+
+    USGHapticGlove* Glove = Hand->GetConnectedGlove();
+    if (!IsValid(Glove))
+    {
+        return;
+    }
+
+    const USGBuzzCommand* BuzzCommand{
+        GetBuzzCommand(
+            ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching)
+    };
+    if (IsValid(BuzzCommand))
+    {
+        Glove->SendHaptics(BuzzCommand);
+
+        const float Duration = FImpl::GetBuzzDuration(
+            ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching);
+
+        Owner->GetWorldTimerManager().ClearTimer(TouchBuzzStopTimer);
+
+        FTimerDelegate TouchBuzzStopHandler;
+        TouchBuzzStopHandler.BindLambda([=]()-> void
+        {
+            Glove->SendHaptics(USGBuzzCommand::Off(Owner));
+        });
+
+        Owner->GetWorldTimerManager().SetTimer(
+            TouchBuzzStopTimer, TouchBuzzStopHandler, Duration, false, -1.0f);
+    }
+    else
+    {
+        Glove->SendHaptics(USGBuzzCommand::Off(Owner));
+    }
+
+    const USGForceFeedbackCommand* ForceFeedbackCommand{
+        GetForceFeedbackCommand(
+            ActorThumbTouching, ActorIndexTouching, ActorMiddleTouching, ActorRingTouching, ActorPinkyTouching)
+    };
+    if (IsValid(ForceFeedbackCommand))
+    {
+        Glove->SendHaptics(ForceFeedbackCommand);
+    }
+    else
+    {
+        Glove->SendHaptics(USGForceFeedbackCommand::Off(Owner));
+    }
+}
+
 void ASGPlayerController::FImplDeleter::operator()(const FImpl* P) const
 {
    delete P;