Integrates Enhaced Input into IntenSelect

Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp

 #include "Pawn/IntenSelectComponent.h"
 
+#include "EnhancedInputSubsystems.h"
 #include "Components/WidgetComponent.h"
 #include "Interaction/Targetable.h"
 #include "Haptics/HapticFeedbackEffect_Curve.h"
@@ -70,6 +71,15 @@ void UIntenSelectComponent::BeginPlay()
 }
 
 void UIntenSelectComponent::InitInputBindings(){
+	const APlayerController* PC = UGameplayStatics::GetPlayerController(GetWorld(), 0);
+
+	UEnhancedInputLocalPlayerSubsystem* Subsystem = ULocalPlayer::GetSubsystem<UEnhancedInputLocalPlayerSubsystem>(PC->GetLocalPlayer());
+	
+	// Clear out existing mapping, and add our mapping
+	Subsystem->ClearAllMappings();
+	Subsystem->AddMappingContext(InputMapping, 0);
+
+	
 	// const auto InputComponent = GetOwner()->FindComponentByClass<UInputComponent>();
 	// if(!InputComponent)
 	// {
@@ -104,7 +114,7 @@ void UIntenSelectComponent::InitSplineComponent()
 		const FString Message = "Error while spawning SplineComponent!";
 		#if WITH_EDITOR
 			const FText Title = FText::FromString(FString("ERROR"));
-			FMessageDialog::Open(EAppMsgType::Ok, FText::FromString(Message), &Title);
+			FMessageDialog::Open(EAppMsgType::Ok, FText::FromString(Message), Title);
 		#endif
 		
 		UE_LOG(LogTemp, Error, TEXT("%s"), *Message)

Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h

 // Fill out your copyright notice in the Description page of Project Settings.
 
 #pragma once
+
+#pragma region /** Includes */
 #include "Kismet/KismetSystemLibrary.h"
 #include "Components/SplineComponent.h"
 #include "Components/SplineMeshComponent.h"
 #include "CoreMinimal.h"
 #include "Kismet/GameplayStatics.h"
-//#include "SteamVRInputDeviceFunctionLibrary.h"
 #include "Components/WidgetInteractionComponent.h"
 #include "Interaction/GrabbingBehaviorComponent.h"
 #include "Interaction/IntenSelectable.h"
 #include "IntenSelectComponent.generated.h"
-
+#pragma endregion
 
 DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnNewComponent);
 
@@ -21,13 +22,14 @@ class RWTHVRTOOLKIT_API UIntenSelectComponent : public UWidgetInteractionCompone
 	GENERATED_BODY()
 
 	
+//	VARIABLES
+	
+#pragma region /** INTERNAL VARIABLES */
 private:
 	float SphereCastRadius;
 	float FeedbackCooldown;
-	
 	bool IsGrabbing;
 	bool IsWidgetInFocus;
-	
 	FVector WidgetFocusPoint;
 
 	UPROPERTY()
@@ -60,11 +62,10 @@ private:
 		UMaterialInterface* DebugConeMaterial;
 	UPROPERTY()
 		UStaticMesh* ForwardRayMesh;
+#pragma endregion
 
+#pragma region /** SETTINGS */
 public:
-
-	//		SETTINGS
-
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "IntenSelect|Settings")
 		bool SetActiveOnStart = true;	
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "IntenSelect|Settings")
@@ -79,9 +80,10 @@ public:
 		float MaxClickStickAngle = 10;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "IntenSelect|Settings")
 		float ForwardRayWidth = 0.01;
+#pragma endregion
 
-	//		REFERENCES
-	
+#pragma region /** REFERENCES */
+public:
 	UPROPERTY(EditAnywhere, Category= "IntenSelect|References")
 		UStaticMesh* SplineMesh;
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|References")
@@ -96,73 +98,96 @@ public:
 		UMaterialParameterCollection* MaterialParamCollection;
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|References")
 		UCurveFloat* ForwardRayTransparencyCurve;
-	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "IntenSelect|References")
-		TArray<AActor*> ActorsToIgnore;
-
-	//		DEBUG VARIABLES
+#pragma endregion
 
+#pragma region /** DEBUG */
+public:
+	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
+		bool bDrawDebugCone = false;
+	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
+		bool bDrawForwardRay = true;
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
 		FRotator DebugConeRotation = FRotator(90, 0, 0);
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
 		FVector DebugConeScale = FVector(1,1,1);
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
 		FVector DebugConePosition = FVector(-90, 0, 0);
-	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
-		bool bDrawDebugCone = false;
-	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
-		bool bDrawForwardRay = true;
 	UPROPERTY(EditAnywhere, Category = "IntenSelect|Debug")
 		float DebugRayTransparency = 1;
+#pragma endregion
+
 
-	//		OTHER
+#pragma region /** Input */
+protected:
+	UPROPERTY(EditDefaultsOnly, BlueprintReadOnly, Category = "Enhanced Input")
+	class UInputMappingContext* InputMapping;
+ 
+#pragma endregion
 	
+#pragma region /** EVENTS */
+public:
 	UPROPERTY(BlueprintAssignable)
 		FOnNewComponent OnNewSelectedEvent;
+#pragma endregion
 
-private:
 
-	//	INITIALIZATION
+// FUNCTIONS
+	
+#pragma region /** INITIALIZATION */
+private:
 	void InitInputBindings();
 	void InitDebugConeMeshComponent();
 	void InitSplineMeshComponent();
 	void InitSplineComponent();
 	void InitForwardRayMeshComponent();
 	void InitMaterialParamCollection();
+#pragma endregion
 	
-	// SCORING
+#pragma region /** SCORING */
+private:
 	float CalculateSphereCastRadius() const;
 	bool GetActorsFromSphereCast(const FVector& SphereCastStart, TArray<FHitResult>& OutHits) const;
 	bool CheckPointInCone(const FVector ConeStartPoint, const FVector ConeForward, const FVector PointToTest, const float Angle) const;
 	UIntenSelectable* GetMaxScoreActor(const float DeltaTime);
+#pragma endregion
 	
-	//	VISUALS
+#pragma region /** VISUALS */
+private:
 	void DrawSelectionCurve(const FVector& EndPoint) const;
 	void AddSplinePointsDefault(const FVector& StartPoint, const FVector& Forward, const FVector& EndPoint) const;
 	void UpdateForwardRay(const FVector& ReferencePoint) const;
+#pragma endregion
 	
-	//	RAYCASTING
+#pragma region /** RAYCASTING */
+private:
 	void HandleWidgetInteraction();
 	TOptional<FHitResult> RaytraceForFirstHit(const FVector& Start, const FVector& End) const;
+#pragma endregion
 		
-	//	INPUT-HANDLING
+#pragma region /** INPUT-HANDLING */
+private:
 	UFUNCTION(BlueprintCallable)
 	void OnFireDown();
 	UFUNCTION(BlueprintCallable)
 	void OnFireUp();
+#pragma endregion
 
-	//	OTHER
+#pragma region /** OTHER */
+private:
 	void HandleCooldown(const float DeltaTime);
 	void HandleGrabbing(const float DeltaTime) const;
 	void HandleNoActorSelected();
 	void HandleActorSelected(UIntenSelectable* NewSelection);
 	FVector ConvertNetVector(FVector_NetQuantize v);
+#pragma endregion 
 	
 public:	
 	UIntenSelectComponent(const FObjectInitializer& ObjectInitializer);
 
-	//	SELECTION
+#pragma region /** SELECTION */
 	void SelectObject(UGrabbingBehaviorComponent* GrabbingBehaviourComponent, UIntenSelectable* SelectableComponent, AActor* SelectedBy);
 	void Unselect();
+#pragma endregion 
 
 	virtual void SetActive(bool bNewActive, bool bReset) override;