Refactors IntenSelect Scoring

Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp

@@ -70,17 +70,17 @@ void UIntenSelectComponent::BeginPlay()
 {
 	Super::BeginPlay();
 
-	this->InitSplineComponent();
-	this->InitSplineMeshComponent();
-	this->InitForwardRayMeshComponent();
-	this->InitDebugConeMeshComponent();
-	this->InitInputBindings();
-	this->InitMaterialParamCollection();
+	InitSplineComponent();
+	InitSplineMeshComponent();
+	InitForwardRayMeshComponent();
+	InitDebugConeMeshComponent();
+	InitInputBindings();
+	InitMaterialParamCollection();
 
-	this->SphereCastRadius = CalculateSphereCastRadius();
-	this->InteractionDistance = this->MaxSelectionDistance;
+	SphereCastRadius = CalculateSphereCastRadius();
+	InteractionDistance = MaxSelectionDistance;
 
-	this->SetActive(SetActiveOnStart, false);
+	SetActive(SetActiveOnStart, false);
 }
 
 void UIntenSelectComponent::InitInputBindings()

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableCircleScoring.h

-// Fill out your copyright notice in the Description page of Project Settings.
-
 #pragma once
 
 #include "CoreMinimal.h"

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableCubeScoring.h

@@ -21,9 +21,6 @@ protected:
 public:
 	UIntenSelectableCubeScoring();
 
-	UPROPERTY(EditAnywhere)
-	bool DrawDebug = true;
-
 	UPROPERTY(EditAnywhere)
 	bool BackFaceCulling = false;
 

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableCylinderScoring.h

@@ -21,9 +21,6 @@ protected:
 public:
 	UIntenSelectableCylinderScoring();
 
-	UPROPERTY(EditAnywhere)
-	bool DrawDebug = true;
-
 	virtual TPair<FHitResult, float> GetBestPointScorePair(const FVector& ConeOrigin,
 														   const FVector& ConeForwardDirection,
 														   const float ConeBackwardShiftDistance, const float ConeAngle,

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableLineScoring.h

@@ -21,9 +21,6 @@ protected:
 public:
 	UIntenSelectableLineScoring();
 
-	UPROPERTY(EditAnywhere)
-	bool DrawDebug = true;
-
 	virtual TPair<FHitResult, float> GetBestPointScorePair(const FVector& ConeOrigin,
 														   const FVector& ConeForwardDirection,
 														   const float ConeBackwardShiftDistance, const float ConeAngle,

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.h

-// Fill out your copyright notice in the Description page of Project Settings.
-
 #pragma once
 
 #include "CoreMinimal.h"

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableRectangleScoring.h

@@ -21,9 +21,6 @@ protected:
 public:
 	UIntenSelectableRectangleScoring();
 
-	UPROPERTY(EditAnywhere)
-	bool DrawDebug = true;
-
 	UPROPERTY(EditAnywhere)
 	bool OnlyOutline = false;
 

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableScoring.h

@@ -17,6 +17,9 @@ protected:
 public:
 	UIntenSelectableScoring();
 
+	UPROPERTY(EditAnywhere)
+	bool DrawDebug = true;
+
 	UPROPERTY(BlueprintReadOnly)
 	float CurrentScore = 0;
 

Source/RWTHVRToolkit/Public/Interaction/Interactables/IntenSelect/IntenSelectableSphereScoring.h

@@ -24,9 +24,6 @@ public:
 	UPROPERTY(EditAnywhere)
 	float Radius = 50;
 
-	UPROPERTY(EditAnywhere)
-	bool DrawDebug = true;
-
 	virtual TPair<FHitResult, float> GetBestPointScorePair(const FVector& ConeOrigin,
 														   const FVector& ConeForwardDirection,
 														   const float ConeBackwardShiftDistance, const float ConeAngle,

Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h

@@ -29,35 +29,47 @@ private:
 	bool IsGrabbing;
 	bool IsWidgetInFocus;
 	FVector WidgetFocusPoint;
+	FVector LastKnownGrabPoint;
 
 	UPROPERTY()
 	UWidgetComponent* LastFocusedWidget;
+
 	UPROPERTY()
 	TMap<UIntenSelectable*, float> ScoreMap;
+
 	UPROPERTY()
 	TMap<UIntenSelectable*, FHitResult> ContactPointMap;
+
 	UPROPERTY()
 	UIntenSelectable* CurrentSelection;
+
 	UPROPERTY()
 	UIntenSelectable* LastKnownSelection;
-	UPROPERTY()
-	FVector LastKnownGrabPoint;
+
 	UPROPERTY()
 	UStaticMeshComponent* DebugConeMeshComponent;
+
 	UPROPERTY()
 	UStaticMeshComponent* ForwardRayMeshComponent;
+
 	UPROPERTY()
 	USplineComponent* SplineComponent;
+
 	UPROPERTY()
 	USplineMeshComponent* SplineMeshComponent;
+
 	UPROPERTY()
 	UMaterialParameterCollectionInstance* ParameterCollectionInstance;
+
 	UPROPERTY()
 	UStaticMesh* DebugConeMesh;
+
 	UPROPERTY()
 	UMaterialInterface* DebugConeMaterial;
+
 	UPROPERTY()
 	UStaticMesh* ForwardRayMesh;
+
 #pragma endregion
 
 #pragma region /** SETTINGS */