Skip to content
Snippets Groups Projects
Commit 3baf0639 authored by David Gilbert's avatar David Gilbert :bug:
Browse files

style(interaction): Make clang format happy.

parent 0d5f5bf7
No related branches found
No related tags found
2 merge requests!107UE5.4-2024.1-rc1,!91Interaction refactoring and replication
Pipeline #433586 passed
...@@ -57,7 +57,8 @@ void UGrabBehavior::ReplicationOriginaterClientCallback(USceneComponent* Trigger ...@@ -57,7 +57,8 @@ void UGrabBehavior::ReplicationOriginaterClientCallback(USceneComponent* Trigger
HandleCollisionHandlingMovement(CurrentAttachParent, EventType); HandleCollisionHandlingMovement(CurrentAttachParent, EventType);
} }
void UGrabBehavior::HandleCollisionHandlingMovement(const USceneComponent* CurrentAttachParent, const EInteractionEventType EventType) void UGrabBehavior::HandleCollisionHandlingMovement(const USceneComponent* CurrentAttachParent,
const EInteractionEventType EventType)
{ {
auto CHM = CurrentAttachParent->GetOwner()->GetComponentByClass<UCollisionHandlingMovement>(); auto CHM = CurrentAttachParent->GetOwner()->GetComponentByClass<UCollisionHandlingMovement>();
if (!CHM) if (!CHM)
...@@ -79,7 +80,6 @@ void UGrabBehavior::HandleCollisionHandlingMovement(const USceneComponent* Curre ...@@ -79,7 +80,6 @@ void UGrabBehavior::HandleCollisionHandlingMovement(const USceneComponent* Curre
CHM->RemoveActorFromIgnore(GetOwner()); CHM->RemoveActorFromIgnore(GetOwner());
} }
} }
} }
void UGrabBehavior::OnActionEvent(USceneComponent* TriggerComponent, const EInteractionEventType EventType, void UGrabBehavior::OnActionEvent(USceneComponent* TriggerComponent, const EInteractionEventType EventType,
const FInputActionValue& Value) const FInputActionValue& Value)
......
...@@ -88,7 +88,8 @@ void UCollisionHandlingMovement::TickComponent(float DeltaTime, enum ELevelTick ...@@ -88,7 +88,8 @@ void UCollisionHandlingMovement::TickComponent(float DeltaTime, enum ELevelTick
// and gravity for walking only // and gravity for walking only
MoveByGravityOrStepUp(DeltaTime); MoveByGravityOrStepUp(DeltaTime);
// if we physically (in the tracking space) walked into something, move the world away (by moving the pawn) // if we physically (in the tracking space) walked into something, move the world away (by moving the
// pawn)
CheckForPhysWalkingCollision(); CheckForPhysWalkingCollision();
} }
} }
......
...@@ -20,7 +20,6 @@ class RWTHVRTOOLKIT_API UGrabBehavior : public UActionBehaviour ...@@ -20,7 +20,6 @@ class RWTHVRTOOLKIT_API UGrabBehavior : public UActionBehaviour
GENERATED_BODY() GENERATED_BODY()
public: public:
UGrabBehavior(); UGrabBehavior();
UPROPERTY(EditAnywhere, Category = "Grabbing") UPROPERTY(EditAnywhere, Category = "Grabbing")
...@@ -55,7 +54,8 @@ public: ...@@ -55,7 +54,8 @@ public:
void ReplicationOriginaterClientCallback(USceneComponent* TriggerComponent, const EInteractionEventType EventType, void ReplicationOriginaterClientCallback(USceneComponent* TriggerComponent, const EInteractionEventType EventType,
const FInputActionValue& Value); const FInputActionValue& Value);
void HandleCollisionHandlingMovement(const USceneComponent* CurrentAttachParent, const EInteractionEventType EventType); void HandleCollisionHandlingMovement(const USceneComponent* CurrentAttachParent,
const EInteractionEventType EventType);
virtual void OnActionEvent(USceneComponent* TriggerComponent, const EInteractionEventType EventType, virtual void OnActionEvent(USceneComponent* TriggerComponent, const EInteractionEventType EventType,
const FInputActionValue& Value) override; const FInputActionValue& Value) override;
......
...@@ -54,14 +54,16 @@ public: ...@@ -54,14 +54,16 @@ public:
/** /**
* This is only executed on the local client which processed the interaction and requested the replication process * This is only executed on the local client which processed the interaction and requested the replication process
* to be started. Can be used e.g. for local effects or things that should be done both on the server and local client. * to be started. Can be used e.g. for local effects or things that should be done both on the server and local
* client.
*/ */
void HoverBehaviourReplicationOriginatorCallback(UHoverBehaviour* Behaviour, const EInteractionEventType EventType, void HoverBehaviourReplicationOriginatorCallback(UHoverBehaviour* Behaviour, const EInteractionEventType EventType,
const FHitResult& Hit); const FHitResult& Hit);
/** /**
* Requests the start of the replication process for the given ActionBehaviour, EventType and the Value of the Input Action. * Requests the start of the replication process for the given ActionBehaviour, EventType and the Value of the Input
* Depending on authority, this executes the replication of the behaviour directly or requests it via a server RPC. * Action. Depending on authority, this executes the replication of the behaviour directly or requests it via a
* server RPC.
*/ */
void RequestActionBehaviourReplicationStart(UActionBehaviour* Behaviour, const EInteractionEventType EventType, void RequestActionBehaviourReplicationStart(UActionBehaviour* Behaviour, const EInteractionEventType EventType,
const FInputActionValue& Value); const FInputActionValue& Value);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment