Skip to content
Snippets Groups Projects
Commit 02cc52b3 authored by Kris Tabea Helwig's avatar Kris Tabea Helwig
Browse files

Implements hacky fix for time experiment (makes OnBeginInteractionInputAction...

Implements hacky fix for time experiment (makes OnBeginInteractionInputAction and OnEndInteractionInputAction public)
parent ec484459
No related branches found
No related tags found
No related merge requests found
...@@ -106,10 +106,10 @@ void UDirectInteractionComponent::SetupPlayerInput(UInputComponent* PlayerInputC ...@@ -106,10 +106,10 @@ void UDirectInteractionComponent::SetupPlayerInput(UInputComponent* PlayerInputC
if (EI == nullptr) if (EI == nullptr)
return; return;
EI->BindAction(InteractionInputAction, ETriggerEvent::Started, this, // EI->BindAction(InteractionInputAction, ETriggerEvent::Started, this,
&UDirectInteractionComponent::OnBeginInteractionInputAction); // &UDirectInteractionComponent::OnBeginInteractionInputAction);
EI->BindAction(InteractionInputAction, ETriggerEvent::Completed, this, // EI->BindAction(InteractionInputAction, ETriggerEvent::Completed, this,
&UDirectInteractionComponent::OnEndInteractionInputAction); // &UDirectInteractionComponent::OnEndInteractionInputAction);
} }
void UDirectInteractionComponent::OnBeginInteractionInputAction(const FInputActionValue& Value) void UDirectInteractionComponent::OnBeginInteractionInputAction(const FInputActionValue& Value)
......
...@@ -28,11 +28,11 @@ public: ...@@ -28,11 +28,11 @@ public:
virtual void SetupPlayerInput(UInputComponent* PlayerInputComponent) override; virtual void SetupPlayerInput(UInputComponent* PlayerInputComponent) override;
private:
virtual void OnBeginInteractionInputAction(const FInputActionValue& Value) override; virtual void OnBeginInteractionInputAction(const FInputActionValue& Value) override;
virtual void OnEndInteractionInputAction(const FInputActionValue& Value) override; virtual void OnEndInteractionInputAction(const FInputActionValue& Value) override;
private:
UPROPERTY() UPROPERTY()
TArray<UInteractableComponent*> PreviousInteractableComponentsInRange; TArray<UInteractableComponent*> PreviousInteractableComponentsInRange;
......
...@@ -94,10 +94,11 @@ public: ...@@ -94,10 +94,11 @@ public:
void MulticastActionBehaviourReplicationStartRpc(UActionBehaviour* Behaviour, const EInteractionEventType EventType, void MulticastActionBehaviourReplicationStartRpc(UActionBehaviour* Behaviour, const EInteractionEventType EventType,
const FInputActionValue& Value); const FInputActionValue& Value);
private: UFUNCTION(BlueprintCallable)
UFUNCTION()
virtual void OnBeginInteractionInputAction(const FInputActionValue& Value); virtual void OnBeginInteractionInputAction(const FInputActionValue& Value);
UFUNCTION() UFUNCTION(BlueprintCallable)
virtual void OnEndInteractionInputAction(const FInputActionValue& Value); virtual void OnEndInteractionInputAction(const FInputActionValue& Value);
private:
}; };
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment