Skip to content
Snippets Groups Projects
Commit 9b6c72e9 authored by Timon Römer's avatar Timon Römer
Browse files

Removes reference initialization in constrctor of IntenSelect Component

parent 88e56f22
No related branches found
No related tags found
1 merge request!87Merge IntenSelect into dev5.3
No preview for this file type
No preview for this file type
// 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"
......
// 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()
......
......@@ -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
......
......@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment