From d0302fe587f4c6aafb5476e549ba4740aa48351a Mon Sep 17 00:00:00 2001
From: David Gilbert <gilbert@vr.rwth-aachen.de>
Date: Mon, 8 Jul 2024 11:00:37 +0200
Subject: [PATCH] refactor(interaction): Fixes issue with function definition
of HasInteractionTypeFlag
---
.../Private/Interaction/Interactables/InteractableComponent.cpp | 2 --
.../Public/Interaction/Interactables/InteractableComponent.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/InteractableComponent.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/InteractableComponent.cpp
index 1e954ee1..0a0df846 100644
--- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/InteractableComponent.cpp
+++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/InteractableComponent.cpp
@@ -8,8 +8,6 @@
#include "Logging/StructuredLog.h"
#include "Utility/RWTHVRUtilities.h"
-bool UInteractableComponent::HasInteractionTypeFlag(EInteractorType type) { return type & InteractorFilter; }
-
void UInteractableComponent::RestrictInteractionToComponents(const TArray<USceneComponent*>& Components)
{
if (Components.IsEmpty())
diff --git a/Source/RWTHVRToolkit/Public/Interaction/Interactables/InteractableComponent.h b/Source/RWTHVRToolkit/Public/Interaction/Interactables/InteractableComponent.h
index ee5c925a..7ef7078b 100644
--- a/Source/RWTHVRToolkit/Public/Interaction/Interactables/InteractableComponent.h
+++ b/Source/RWTHVRToolkit/Public/Interaction/Interactables/InteractableComponent.h
@@ -55,7 +55,7 @@ public:
bool bAllowInteractionFromChildGeometry = true;
UFUNCTION(BlueprintCallable)
- FORCEINLINE bool HasInteractionTypeFlag(EInteractorType type);
+ FORCEINLINE bool HasInteractionTypeFlag(EInteractorType Type) { return Type & InteractorFilter; }
/**
* @brief Restrict interactability to given components (e.g. if an object is grabbed, block interactions from other
--
GitLab