diff --git a/Content/IntenSelect/IntenSelectComponent.uasset b/Content/IntenSelect/IntenSelectComponent.uasset index bcbca98fc2ae30365a94ebddefbcd2c0b4019034..cfe13cafdbd408c2a7f1fc8d5cce5d7e3cbfbb7e 100644 Binary files a/Content/IntenSelect/IntenSelectComponent.uasset and b/Content/IntenSelect/IntenSelectComponent.uasset differ diff --git a/Content/Pawn/BP_RWTHVRPawn_Default.uasset b/Content/Pawn/BP_RWTHVRPawn_Default.uasset index 6171681e8ed6e3a4eae1879d475dac62e33c4c99..3ce2c1750052c1c9c8716ac8370c8468f6230d1f 100644 Binary files a/Content/Pawn/BP_RWTHVRPawn_Default.uasset and b/Content/Pawn/BP_RWTHVRPawn_Default.uasset differ diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp index b7fcb074af54a0003247301cf89ce16519bcc451..fef2fd785f6c50d0a024a718530179886bcb6a0e 100644 --- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp +++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectable.cpp @@ -1,5 +1,3 @@ -// Fill out your copyright notice in the Description page of Project Settings. - #include "Interaction/Interactables/IntenSelect/IntenSelectable.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableScoring.h" #include "Interaction/Interactables/IntenSelect/IntenSelectableSinglePointScoring.h" diff --git a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp index 03b04e32b549450947e0d663c4a5757e1ced9b76..4c44f369b5b1237984f11d8d48f7e992e6e5b83e 100644 --- a/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp +++ b/Source/RWTHVRToolkit/Private/Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.cpp @@ -1,9 +1,5 @@ -// Fill out your copyright notice in the Description page of Project Settings. - #include "Interaction/Interactables/IntenSelect/IntenSelectableMultiPointScoring.h" - #include "Kismet/KismetMathLibrary.h" -#include "Net/Core/PushModel/PushModel.h" // Sets default values for this component's properties UIntenSelectableMultiPointScoring::UIntenSelectableMultiPointScoring() diff --git a/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp b/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp index 130b0efe188223b769f60f08c2771b8474247b1d..a49bf06802c987f2ba2ae006800eb4dcc07c979f 100644 --- a/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/IntenSelectComponent.cpp @@ -19,50 +19,6 @@ UIntenSelectComponent::UIntenSelectComponent(const FObjectInitializer& ObjectIni bShowDebug = false; // otherwise the WidgetInteractionComponent debug vis is shown InteractionSource = EWidgetInteractionSource::Custom; // can also be kept at default (World), this way, however, we // efficiently reuse the line traces - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultConeMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/DebugConeMesh.DebugConeMesh'")); - this->DebugConeMesh = DefaultConeMesh.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultConeMeshMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/DebugConeMaterial.DebugConeMaterial'")); - this->DebugConeMaterial = DefaultConeMeshMaterial.Object; - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultSplineMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/sectionedCubeMesh.sectionedCubeMesh'")); - this->SplineMesh = DefaultSplineMesh.Object; - - ConstructorHelpers::FObjectFinder<UStaticMesh> DefaultForwardRayMesh( - TEXT("StaticMesh'/RWTHVRToolkit/IntenSelect/RayMesh.RayMesh'")); - this->ForwardRayMesh = DefaultForwardRayMesh.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultSplineMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/SelectionSplineMaterial.SelectionSplineMaterial'")); - this->SplineMaterial = DefaultSplineMaterial.Object; - - ConstructorHelpers::FObjectFinder<UMaterialInterface> DefaultForwardRayMaterial( - TEXT("Material'/RWTHVRToolkit/IntenSelect/ForwadRayMaterial.ForwadRayMaterial'")); - this->ForwardRayMaterial = DefaultForwardRayMaterial.Object; - - ConstructorHelpers::FObjectFinder<UHapticFeedbackEffect_Curve> DefaultSelectionFeedbackHaptic( - TEXT("HapticFeedbackEffect_Curve'/RWTHVRToolkit/IntenSelect/OnSelectHapticFeedback.OnSelectHapticFeedback'")); - this->SelectionFeedbackHaptic = DefaultSelectionFeedbackHaptic.Object; - - ConstructorHelpers::FObjectFinder<USoundBase> DefaultOnSelectSound( - TEXT("SoundWave'/RWTHVRToolkit/IntenSelect/OnSelectSound.OnSelectSound'")); - this->OnSelectSound = DefaultOnSelectSound.Object; - - ConstructorHelpers::FObjectFinder<UMaterialParameterCollection> DefaultMaterialParamCollection( - TEXT("MaterialParameterCollection'/RWTHVRToolkit/IntenSelect/ForwardRayParams.ForwardRayParams'")); - this->MaterialParamCollection = DefaultMaterialParamCollection.Object; - - ConstructorHelpers::FObjectFinder<UCurveFloat> DefaultForwardRayTransparencyCurve( - TEXT("CurveFloat'/RWTHVRToolkit/IntenSelect/ForwardRayTransparencyCurve.ForwardRayTransparencyCurve'")); - this->ForwardRayTransparencyCurve = DefaultForwardRayTransparencyCurve.Object; - - ConstructorHelpers::FObjectFinder<UInputAction> InputActionClick( - TEXT("/Script/EnhancedInput.InputAction'/RWTHVRToolkit/IntenSelect/IntenSelectClick.IntenSelectClick'")); - this->InputClick = InputActionClick.Object; } // Called when the game starts diff --git a/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h b/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h index 3add1cac45596721e2281496af69586b90040cd7..272755be5cabb24d83cf6ecbc5b9068a3ed40922 100644 --- a/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h +++ b/Source/RWTHVRToolkit/Public/Pawn/IntenSelectComponent.h @@ -12,7 +12,7 @@ DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnNewComponent); -UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent), Blueprintable) +UCLASS(ClassGroup = (Custom), meta = (BlueprintSpawnableComponent), Abstract) class RWTHVRTOOLKIT_API UIntenSelectComponent : public UWidgetInteractionComponent { GENERATED_BODY() @@ -59,15 +59,6 @@ private: UPROPERTY() UMaterialParameterCollectionInstance* ParameterCollectionInstance; - UPROPERTY() - UStaticMesh* DebugConeMesh; - - UPROPERTY() - UMaterialInterface* DebugConeMaterial; - - UPROPERTY() - UStaticMesh* ForwardRayMesh; - #pragma endregion #pragma region /** SETTINGS */ @@ -92,18 +83,33 @@ public: public: UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UStaticMesh* SplineMesh; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialInterface* SplineMaterial; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialInterface* ForwardRayMaterial; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UHapticFeedbackEffect_Base* SelectionFeedbackHaptic; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") USoundBase* OnSelectSound; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UMaterialParameterCollection* MaterialParamCollection; + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") UCurveFloat* ForwardRayTransparencyCurve; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UStaticMesh* ForwardRayMesh; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UMaterialInterface* DebugConeMaterial; + + UPROPERTY(EditAnywhere, Category = "IntenSelect|References") + UStaticMesh* DebugConeMesh; #pragma endregion #pragma region /** DEBUG */