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

Cleans up and refactors

parent 5a3ef6a1
Branches
Tags
2 merge requests!81Inten Select 5.3,!80UE5.3-2023.1-rc2
Pipeline #371705 failed
Stage: analyze
Stage: generate
Stage: build
Show whitespace changes
Inline Side-by-side
Source/RWTHVRToolkit/Private/UI/IntenSelectableWidget.cpp deleted 100644 → 0
+ 0
− 8
View file @ 5a3ef6a1
// Fill out your copyright notice in the Description page of Project Settings.
#include "UI/IntenSelectableWidget.h"
UIntenSelectableWidget::UIntenSelectableWidget(const FObjectInitializer& ObjectInitializer)
:Super(ObjectInitializer)
{}
Source/RWTHVRToolkit/Public/UI/IntenSelectableWidget.h deleted 100644 → 0
+ 0
− 27
View file @ 5a3ef6a1
// Fill out your copyright notice in the Description page of Project Settings.
#pragma once
#include "CoreMinimal.h"
#include "UObject/Object.h"
#include "UObject/Interface.h"
#include "IntenSelectableWidget.generated.h"
UINTERFACE(BlueprintType)
class UIntenSelectableWidget : public UInterface
{
GENERATED_UINTERFACE_BODY()
};
class IIntenSelectableWidget
{
GENERATED_IINTERFACE_BODY()
public:
UFUNCTION(BlueprintNativeEvent, BlueprintCallable)
FVector GetCoordinates();
UFUNCTION(BlueprintNativeEvent, BlueprintCallable)
FVector2D GetUISize();
};
\ No newline at end of file
Source/RWTHVRToolkitEditor/Private/RWTHVRToolkitEditor.cpp
+ 41
− 32
View file @ 9b15677d
#include "RWTHVRToolkitEditor.h"
#include "UnrealEdGlobals.h"
#include "Editor/UnrealEdEngine.h"
#include "Interaction/IntenSelectableCylinderScoringVisualizer.h"
......@@ -11,79 +10,89 @@
#include "Interaction/Interactables/IntenSelect/IntenSelectableRectangleScoring.h"
#include "Interaction/Interactables/IntenSelect/IntenSelectableSphereScoring.h"
IMPLEMENT_GAME_MODULE(FRWTHVRToolkitEditorModule, RWTHVRToolkitEditor);
#include "RWTHVRToolkitEditor.h"
#include "ComponentVisualizers.h"
#include "Interaction/IntenSelectableLineScoringVisualizer.h"
#include "UnrealEdGlobals.h"
#include "Editor/UnrealEdEngine.h"
#include "Interaction/IntenSelectableCircleScoringVisualizer.h"
#include "Interaction/IntenSelectableCubeScoringVisualizer.h"
#include "Interaction/IntenSelectableLineScoringVisualizer.h"
#include "Interaction/IntenSelectableMultiPointScoringVisualizer.h"
#include "Interaction/IntenSelectableRectangleScoringVisualizer.h"
#include "Interaction/IntenSelectableSphereScoringVisualizer.h"
IMPLEMENT_GAME_MODULE(FRWTHVRToolkitEditorModule, RWTHVRToolkitEditor);
#define LOCTEXT_NAMESPACE "RWTHVRToolkitEditor"
void FRWTHVRToolkitEditorModule::StartupModule()
{
if (GUnrealEd != NULL)
if (GUnrealEd != nullptr)
{
const TSharedPtr<FComponentVisualizer> IntenSelectableLineVisualizer = MakeShareable(new FIntenSelectableLineScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableLineVisualizer =
MakeShareable(new FIntenSelectableLineScoringVisualizer());
if (IntenSelectableLineVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableLineScoring::StaticClass()->GetFName(), IntenSelectableLineVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableLineScoring::StaticClass()->GetFName(),
IntenSelectableLineVisualizer);
IntenSelectableLineVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableMultipointScoringVisualizer = MakeShareable(new FIntenSelectableMultiPointScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableMultipointScoringVisualizer =
MakeShareable(new FIntenSelectableMultiPointScoringVisualizer());
if (IntenSelectableMultipointScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableMultiPointScoring::StaticClass()->GetFName(), IntenSelectableMultipointScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableMultiPointScoring::StaticClass()->GetFName(),
IntenSelectableMultipointScoringVisualizer);
IntenSelectableMultipointScoringVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableCircleScoringVisualizer = MakeShareable(new FIntenSelectableCircleScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableCircleScoringVisualizer =
MakeShareable(new FIntenSelectableCircleScoringVisualizer());
if (IntenSelectableCircleScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCircleScoring::StaticClass()->GetFName(), IntenSelectableCircleScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCircleScoring::StaticClass()->GetFName(),
IntenSelectableCircleScoringVisualizer);
IntenSelectableCircleScoringVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableRectangleScoringVisualizer = MakeShareable(new FIntenSelectableRectangleScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableRectangleScoringVisualizer =
MakeShareable(new FIntenSelectableRectangleScoringVisualizer());
if (IntenSelectableRectangleScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableRectangleScoring::StaticClass()->GetFName(), IntenSelectableRectangleScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableRectangleScoring::StaticClass()->GetFName(),
IntenSelectableRectangleScoringVisualizer);
IntenSelectableRectangleScoringVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableSphereScoringVisualizer = MakeShareable(new FIntenSelectableSphereScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableSphereScoringVisualizer =
MakeShareable(new FIntenSelectableSphereScoringVisualizer());
if (IntenSelectableSphereScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableSphereScoring::StaticClass()->GetFName(), IntenSelectableSphereScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableSphereScoring::StaticClass()->GetFName(),
IntenSelectableSphereScoringVisualizer);
IntenSelectableSphereScoringVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableCubeScoringVisualizer = MakeShareable(new FIntenSelectableCubeScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableCubeScoringVisualizer =
MakeShareable(new FIntenSelectableCubeScoringVisualizer());
if (IntenSelectableCubeScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCubeScoring::StaticClass()->GetFName(), IntenSelectableCubeScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCubeScoring::StaticClass()->GetFName(),
IntenSelectableCubeScoringVisualizer);
IntenSelectableCubeScoringVisualizer->OnRegister();
}
const TSharedPtr<FComponentVisualizer> IntenSelectableCylinderScoringVisualizer = MakeShareable(new FIntenSelectableCylinderScoringVisualizer());
const TSharedPtr<FComponentVisualizer> IntenSelectableCylinderScoringVisualizer =
MakeShareable(new FIntenSelectableCylinderScoringVisualizer());
if (IntenSelectableCylinderScoringVisualizer.IsValid())
{
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCylinderScoring::StaticClass()->GetFName(), IntenSelectableCylinderScoringVisualizer);
GUnrealEd->RegisterComponentVisualizer(UIntenSelectableCylinderScoring::StaticClass()->GetFName(),
IntenSelectableCylinderScoringVisualizer);
IntenSelectableCylinderScoringVisualizer->OnRegister();
}
}
......@@ -91,7 +100,7 @@ void FRWTHVRToolkitEditorModule::StartupModule()
void FRWTHVRToolkitEditorModule::ShutdownModule()
{
if (GUnrealEd != NULL)
if (GUnrealEd != nullptr)
{
GUnrealEd->UnregisterComponentVisualizer(UIntenSelectableLineScoring::StaticClass()->GetFName());
GUnrealEd->UnregisterComponentVisualizer(UIntenSelectableMultiPointScoring::StaticClass()->GetFName());
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment