From 3866a61a3f4dc2075cd1096bb4b91d17bcd328ad Mon Sep 17 00:00:00 2001 From: Simon Oehrl <simon.oehrl@rwth-aachen.de> Date: Fri, 2 Jul 2021 13:30:25 +0200 Subject: [PATCH] Rename plugin RWTHVRToolkit --- .gitlab-ci.yml | 6 +++--- Config/DefaultRWTHVRToolkit.ini | 3 +++ README.md | 4 ++-- ...xtensions.uplugin => RWTHVRToolkit.uplugin | 6 +++--- Resources/Icon128.png | Bin 3925 -> 4095 bytes .../Private/DisplayClusterExtensions.cpp | 20 ------------------ .../Cluster/CAVEOverlay/CAVEOverlay.cpp | 0 .../CAVEOverlay/CAVEOverlayController.cpp | 8 +++---- .../Private/Cluster/ClusterConsole.cpp | 0 .../Private/Fixes/FixNDisplayStereoDevice.cpp | 0 .../Private/Interaction/Clickable.cpp | 0 .../Private/Interaction/Grabable.cpp | 0 .../Interaction/GrabbingBehaviorComponent.cpp | 0 .../GrabbingBehaviorOnLineComponent.cpp | 0 .../GrabbingBehaviorOnPlaneComponent.cpp | 0 .../Private/Interaction/Targetable.cpp | 0 .../Pawn/BasicVRInteractionComponent.cpp | 2 +- .../Pawn/UniversalTrackedComponent.cpp | 0 .../Private/Pawn/VRPawnMovement.cpp | 0 .../Private/Pawn/VirtualRealityPawn.cpp | 0 .../RWTHVRToolkit/Private/RWTHVRToolkit.cpp | 20 ++++++++++++++++++ .../Utility/VirtualRealityUtilities.cpp | 0 .../Public/Cluster/CAVEOverlay/CAVEOverlay.h | 2 +- .../CAVEOverlay/CAVEOverlayController.h | 2 +- .../Cluster/CAVEOverlay/CAVEOverlaySettings.h | 2 +- .../Cluster/CAVEOverlay/DoorOverlayData.h | 2 +- .../Public/Cluster/ClusterConsole.h | 2 +- .../DisplayClusterEventParameterHelper.h | 0 .../Events/DisplayClusterEventWrapper.h | 0 .../Public/Fixes/FixNDisplayStereoDevice.h | 2 +- .../Public/Interaction/Clickable.h | 2 +- .../Public/Interaction/Grabable.h | 2 +- .../Interaction/GrabbingBehaviorComponent.h | 2 +- .../GrabbingBehaviorOnLineComponent.h | 2 +- .../GrabbingBehaviorOnPlaneComponent.h | 2 +- .../Public/Interaction/Targetable.h | 2 +- .../Public/Pawn/BasicVRInteractionComponent.h | 2 +- .../Public/Pawn/UniversalTrackedComponent.h | 2 +- .../Public/Pawn/VRPawnMovement.h | 2 +- .../Public/Pawn/VirtualRealityPawn.h | 2 +- .../Public/RWTHVRToolkit.h} | 2 +- .../Public/Utility/VirtualRealityUtilities.h | 2 +- .../RWTHVRToolkit.Build.cs} | 12 +++++------ .../GrabbingBehaviorOnLineVisualizer.cpp | 0 .../GrabbingBehaviorPlaneVisualizer.cpp | 0 .../Private/RWTHVRToolkitEditor.cpp} | 10 ++++----- .../GrabbingBehaviorOnLineVisualizer.h | 2 +- .../GrabbingBehaviorPlaneVisualizer.h | 2 +- .../Public/RWTHVRToolkitEditor.h} | 2 +- .../RWTHVRToolkitEditor.Build.cs} | 6 +++--- 50 files changed, 71 insertions(+), 68 deletions(-) create mode 100644 Config/DefaultRWTHVRToolkit.ini rename nDisplayExtensions.uplugin => RWTHVRToolkit.uplugin (81%) delete mode 100644 Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp (98%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Cluster/ClusterConsole.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Fixes/FixNDisplayStereoDevice.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/Clickable.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/Grabable.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/GrabbingBehaviorComponent.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/GrabbingBehaviorOnLineComponent.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/GrabbingBehaviorOnPlaneComponent.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Interaction/Targetable.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Pawn/BasicVRInteractionComponent.cpp (99%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Pawn/UniversalTrackedComponent.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Pawn/VRPawnMovement.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Pawn/VirtualRealityPawn.cpp (100%) create mode 100644 Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Private/Utility/VirtualRealityUtilities.cpp (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/CAVEOverlay/CAVEOverlay.h (89%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/CAVEOverlay/CAVEOverlayController.h (96%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h (86%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/CAVEOverlay/DoorOverlayData.h (87%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/ClusterConsole.h (90%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/Events/DisplayClusterEventParameterHelper.h (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Cluster/Events/DisplayClusterEventWrapper.h (100%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Fixes/FixNDisplayStereoDevice.h (92%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/Clickable.h (87%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/Grabable.h (88%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/GrabbingBehaviorComponent.h (91%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/GrabbingBehaviorOnLineComponent.h (91%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h (90%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Interaction/Targetable.h (93%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Pawn/BasicVRInteractionComponent.h (94%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Pawn/UniversalTrackedComponent.h (93%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Pawn/VRPawnMovement.h (94%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Pawn/VirtualRealityPawn.h (94%) rename Source/{DisplayClusterExtensions/Public/DisplayClusterExtensions.h => RWTHVRToolkit/Public/RWTHVRToolkit.h} (82%) rename Source/{DisplayClusterExtensions => RWTHVRToolkit}/Public/Utility/VirtualRealityUtilities.h (94%) rename Source/{DisplayClusterExtensions/DisplayClusterExtensions.Build.cs => RWTHVRToolkit/RWTHVRToolkit.Build.cs} (77%) rename Source/{DisplayClusterExtensionsEditor => RWTHVRToolkitEditor}/Private/Interaction/GrabbingBehaviorOnLineVisualizer.cpp (100%) rename Source/{DisplayClusterExtensionsEditor => RWTHVRToolkitEditor}/Private/Interaction/GrabbingBehaviorPlaneVisualizer.cpp (100%) rename Source/{DisplayClusterExtensionsEditor/Private/DisplayClusterExtensionsEditor.cpp => RWTHVRToolkitEditor/Private/RWTHVRToolkitEditor.cpp} (77%) rename Source/{DisplayClusterExtensionsEditor => RWTHVRToolkitEditor}/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h (80%) rename Source/{DisplayClusterExtensionsEditor => RWTHVRToolkitEditor}/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h (80%) rename Source/{DisplayClusterExtensionsEditor/Public/DisplayClusterExtensionsEditor.h => RWTHVRToolkitEditor/Public/RWTHVRToolkitEditor.h} (77%) rename Source/{DisplayClusterExtensionsEditor/DIsplayClusterExtensionsEditor.Build.cs => RWTHVRToolkitEditor/RWTHVRToolkitEditor.Build.cs} (86%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index db2aaf64..c0b420ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ include: # extends: .Generate_Project_ # variables: # GEN_TEMPLATE_REPO: "https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/unrealprojecttemplate.git" -# GEN_TEMPLATE_BRANCH: "develop" +# GEN_TEMPLATE_BRANCH: "4.26" # GEN_DEPENDENCIES: "( -# [master@nDisplayExtensions]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/ndisplayextensions.git' -# [master@UniversalLogging]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/universallogging.git' +# [4.26@RWTHVRToolkit]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/Plugins/rwth-vr-toolkit.git' +# [4.26@UniversalLogging]='https://devhub.vr.rwth-aachen.de/VR-Group/unreal-development/Plugins/universallogging.git' # )" # # You can uncomment the deploy lines to deploy your project to the CAVE/VRDev. This only makes sense, if your plugin works diff --git a/Config/DefaultRWTHVRToolkit.ini b/Config/DefaultRWTHVRToolkit.ini new file mode 100644 index 00000000..739c6efc --- /dev/null +++ b/Config/DefaultRWTHVRToolkit.ini @@ -0,0 +1,3 @@ +[CoreRedirects] ++PackageRedirects=(OldName="/nDisplayExtensions",NewName="/RWTHVRToolkit",MatchSubstring=true) ++PackageRedirects=(OldName="/DisplayClusterExtensions",NewName="/RWTHVRToolkit",MatchSubstring=true) \ No newline at end of file diff --git a/README.md b/README.md index 1a729310..d71a6e71 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# :card_index_dividers: nDisplayExtensions -The nDisplayExtensions are a collection of extensions of the VR-Group at the RWTH which are used in many of our applications. +# :card_index_dividers: RWTH VR Toolkit +The **RWTH VR Toolkit** are a collection of extensions of the VR-Group at the RWTH which are used in many of our applications. The contents of this plugin are constantly extended and improved to reflect changes in the Unreal nDisplay Plugin that we use to support our aixCAVE with Unreal. In the following the main features are explained: diff --git a/nDisplayExtensions.uplugin b/RWTHVRToolkit.uplugin similarity index 81% rename from nDisplayExtensions.uplugin rename to RWTHVRToolkit.uplugin index 2946b41b..a0891804 100644 --- a/nDisplayExtensions.uplugin +++ b/RWTHVRToolkit.uplugin @@ -2,7 +2,7 @@ "FileVersion": 3, "Version": 1, "VersionName": "1.0", - "FriendlyName": "nDisplayExtensions", + "FriendlyName": "RWTH VR Toolkit", "Description": "", "Category": "Other", "CreatedBy": "", @@ -16,12 +16,12 @@ "EnabledByDefault": true, "Modules": [ { - "Name": "DisplayClusterExtensions", + "Name": "RWTHVRToolkit", "Type": "Runtime", "LoadingPhase": "Default" }, { - "Name": "DisplayClusterExtensionsEditor", + "Name": "RWTHVRToolkitEditor", "Type": "Editor", "LoadingPhase": "PostEngineInit" } diff --git a/Resources/Icon128.png b/Resources/Icon128.png index 77dcd239fa6f636b8032bdb878d85b8eacb8ef7f..161ff0bd132ac70451595cd66f962c80e7eea8ca 100644 GIT binary patch literal 4095 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 Ak^lez literal 3925 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 MboFyt=akR{0BDGW!2kdN diff --git a/Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp b/Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp deleted file mode 100644 index 68fb57e7..00000000 --- a/Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "DisplayClusterExtensions.h" - -#define LOCTEXT_NAMESPACE "FnDisplayExtensionsModule" - -void FDisplayClusterExtensionsModule::StartupModule () -{ - ClusterConsole.Register(); - StereoDeviceFix.Register(); - CAVEOverlay.Register(); -} -void FDisplayClusterExtensionsModule::ShutdownModule() -{ - ClusterConsole.Unregister(); - StereoDeviceFix.Unregister(); - CAVEOverlay.Unregister(); -} - -#undef LOCTEXT_NAMESPACE - -IMPLEMENT_MODULE(FDisplayClusterExtensionsModule, DisplayClusterExtensions) \ No newline at end of file diff --git a/Source/DisplayClusterExtensions/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp b/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp rename to Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp diff --git a/Source/DisplayClusterExtensions/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp b/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp similarity index 98% rename from Source/DisplayClusterExtensions/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp rename to Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp index 1d78376e..71251d17 100644 --- a/Source/DisplayClusterExtensions/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp +++ b/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp @@ -50,7 +50,7 @@ ACAVEOverlayController::ACAVEOverlayController() bAllowTickBeforeBeginPlay = false; AutoReceiveInput = EAutoReceiveInput::Player0; - ConstructorHelpers::FClassFinder<UDoorOverlayData> WidgetClassFinder(TEXT("Blueprint'/nDisplayExtensions/CAVEOverlay/DoorOverlay'")); + ConstructorHelpers::FClassFinder<UDoorOverlayData> WidgetClassFinder(TEXT("Blueprint'/RWTHVRToolkit/CAVEOverlay/DoorOverlay'")); if (WidgetClassFinder.Succeeded()) { OverlayClass = WidgetClassFinder.Class; @@ -69,9 +69,9 @@ ACAVEOverlayController::ACAVEOverlayController() SignRoot->SetupAttachment(Root); //Loading of Materials and Meshes - LoadAsset("/nDisplayExtensions/CAVEOverlay/Stripes", TapeMaterial); - LoadAsset("/nDisplayExtensions/CAVEOverlay/StopMaterial", SignMaterial); - LoadAsset("/nDisplayExtensions/CAVEOverlay/Plane", PlaneMesh); + LoadAsset("/RWTHVRToolkit/CAVEOverlay/Stripes", TapeMaterial); + LoadAsset("/RWTHVRToolkit/CAVEOverlay/StopMaterial", SignMaterial); + LoadAsset("/RWTHVRToolkit/CAVEOverlay/Plane", PlaneMesh); TapeNegativeY = CreateMeshComponent("TapeNegY", PlaneMesh, TapeRoot); TapeNegativeX = CreateMeshComponent("TapeNegX", PlaneMesh, TapeRoot); diff --git a/Source/DisplayClusterExtensions/Private/Cluster/ClusterConsole.cpp b/Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Cluster/ClusterConsole.cpp rename to Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp diff --git a/Source/DisplayClusterExtensions/Private/Fixes/FixNDisplayStereoDevice.cpp b/Source/RWTHVRToolkit/Private/Fixes/FixNDisplayStereoDevice.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Fixes/FixNDisplayStereoDevice.cpp rename to Source/RWTHVRToolkit/Private/Fixes/FixNDisplayStereoDevice.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/Clickable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Clickable.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/Clickable.cpp rename to Source/RWTHVRToolkit/Private/Interaction/Clickable.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/Grabable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Grabable.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/Grabable.cpp rename to Source/RWTHVRToolkit/Private/Interaction/Grabable.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorComponent.cpp b/Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorComponent.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorComponent.cpp rename to Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorComponent.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorOnLineComponent.cpp b/Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorOnLineComponent.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorOnLineComponent.cpp rename to Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorOnLineComponent.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorOnPlaneComponent.cpp b/Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorOnPlaneComponent.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/GrabbingBehaviorOnPlaneComponent.cpp rename to Source/RWTHVRToolkit/Private/Interaction/GrabbingBehaviorOnPlaneComponent.cpp diff --git a/Source/DisplayClusterExtensions/Private/Interaction/Targetable.cpp b/Source/RWTHVRToolkit/Private/Interaction/Targetable.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Interaction/Targetable.cpp rename to Source/RWTHVRToolkit/Private/Interaction/Targetable.cpp diff --git a/Source/DisplayClusterExtensions/Private/Pawn/BasicVRInteractionComponent.cpp b/Source/RWTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp similarity index 99% rename from Source/DisplayClusterExtensions/Private/Pawn/BasicVRInteractionComponent.cpp rename to Source/RWTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp index bd2bc48e..b9e62ccb 100644 --- a/Source/DisplayClusterExtensions/Private/Pawn/BasicVRInteractionComponent.cpp +++ b/Source/RWTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp @@ -24,7 +24,7 @@ UBasicVRInteractionComponent::UBasicVRInteractionComponent() // Setup the interaction ray. InteractionRay = CreateDefaultSubobject<UStaticMeshComponent>(TEXT("Interaction Ray")); //this ray model has an inlayed cross with flipped normals so it can be seen as a cross in desktop mode where the right hand is attached to the head - ConstructorHelpers::FObjectFinder<UStaticMesh> MeshAsset(TEXT("/nDisplayExtensions/PointingRay/Ray_Mesh")); + ConstructorHelpers::FObjectFinder<UStaticMesh> MeshAsset(TEXT("/RWTHVRToolkit/PointingRay/Ray_Mesh")); if (MeshAsset.Object != nullptr) { InteractionRay->SetStaticMesh(MeshAsset.Object); diff --git a/Source/DisplayClusterExtensions/Private/Pawn/UniversalTrackedComponent.cpp b/Source/RWTHVRToolkit/Private/Pawn/UniversalTrackedComponent.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Pawn/UniversalTrackedComponent.cpp rename to Source/RWTHVRToolkit/Private/Pawn/UniversalTrackedComponent.cpp diff --git a/Source/DisplayClusterExtensions/Private/Pawn/VRPawnMovement.cpp b/Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Pawn/VRPawnMovement.cpp rename to Source/RWTHVRToolkit/Private/Pawn/VRPawnMovement.cpp diff --git a/Source/DisplayClusterExtensions/Private/Pawn/VirtualRealityPawn.cpp b/Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Pawn/VirtualRealityPawn.cpp rename to Source/RWTHVRToolkit/Private/Pawn/VirtualRealityPawn.cpp diff --git a/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp b/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp new file mode 100644 index 00000000..1b35313f --- /dev/null +++ b/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp @@ -0,0 +1,20 @@ +#include "RWTHVRToolkit.h" + +#define LOCTEXT_NAMESPACE "FRWTHVRToolkitModule" + +void FRWTHVRToolkitModule::StartupModule () +{ + ClusterConsole.Register(); + StereoDeviceFix.Register(); + CAVEOverlay.Register(); +} +void FRWTHVRToolkitModule::ShutdownModule() +{ + ClusterConsole.Unregister(); + StereoDeviceFix.Unregister(); + CAVEOverlay.Unregister(); +} + +#undef LOCTEXT_NAMESPACE + +IMPLEMENT_MODULE(FRWTHVRToolkitModule, RWTHVRToolkit) \ No newline at end of file diff --git a/Source/DisplayClusterExtensions/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp similarity index 100% rename from Source/DisplayClusterExtensions/Private/Utility/VirtualRealityUtilities.cpp rename to Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp diff --git a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlay.h b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h similarity index 89% rename from Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlay.h rename to Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h index ced7309b..c84304d4 100644 --- a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlay.h +++ b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h @@ -11,7 +11,7 @@ * Adds the warning tape, which appears if the user gets too close to the wall for the aixCAVE */ USTRUCT() -struct DISPLAYCLUSTEREXTENSIONS_API FCAVEOverlay +struct RWTHVRTOOLKIT_API FCAVEOverlay { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlayController.h b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h similarity index 96% rename from Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlayController.h rename to Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h index d73f1214..74d41de0 100644 --- a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlayController.h +++ b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h @@ -10,7 +10,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogCAVEOverlay, Log, All); UCLASS() -class DISPLAYCLUSTEREXTENSIONS_API ACAVEOverlayController : public AActor +class RWTHVRTOOLKIT_API ACAVEOverlayController : public AActor { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h similarity index 86% rename from Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h rename to Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h index 307439a7..f086b9df 100644 --- a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h +++ b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h @@ -11,7 +11,7 @@ enum DefaultActivationType }; UCLASS(config=Game, defaultconfig, meta=(DisplayName="CAVE Overlay")) -class DISPLAYCLUSTEREXTENSIONS_API UCAVEOverlaySettings : public UDeveloperSettings +class RWTHVRTOOLKIT_API UCAVEOverlaySettings : public UDeveloperSettings { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/DoorOverlayData.h b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h similarity index 87% rename from Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/DoorOverlayData.h rename to Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h index 09bedc07..56ca400a 100644 --- a/Source/DisplayClusterExtensions/Public/Cluster/CAVEOverlay/DoorOverlayData.h +++ b/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h @@ -12,7 +12,7 @@ * Used as a parent-class in the overlay widget. Like this we can access the UMG properties in C++ */ UCLASS() -class DISPLAYCLUSTEREXTENSIONS_API UDoorOverlayData : public UUserWidget +class RWTHVRTOOLKIT_API UDoorOverlayData : public UUserWidget { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Cluster/ClusterConsole.h b/Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h similarity index 90% rename from Source/DisplayClusterExtensions/Public/Cluster/ClusterConsole.h rename to Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h index 21120d2c..700dceb5 100644 --- a/Source/DisplayClusterExtensions/Public/Cluster/ClusterConsole.h +++ b/Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h @@ -12,7 +12,7 @@ * This class has to be registered and unregistered. This can easily be done in every StartupModule/ShutdownModule functions. */ USTRUCT() -struct DISPLAYCLUSTEREXTENSIONS_API FClusterConsole +struct RWTHVRTOOLKIT_API FClusterConsole { GENERATED_BODY() private: diff --git a/Source/DisplayClusterExtensions/Public/Cluster/Events/DisplayClusterEventParameterHelper.h b/Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventParameterHelper.h similarity index 100% rename from Source/DisplayClusterExtensions/Public/Cluster/Events/DisplayClusterEventParameterHelper.h rename to Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventParameterHelper.h diff --git a/Source/DisplayClusterExtensions/Public/Cluster/Events/DisplayClusterEventWrapper.h b/Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventWrapper.h similarity index 100% rename from Source/DisplayClusterExtensions/Public/Cluster/Events/DisplayClusterEventWrapper.h rename to Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventWrapper.h diff --git a/Source/DisplayClusterExtensions/Public/Fixes/FixNDisplayStereoDevice.h b/Source/RWTHVRToolkit/Public/Fixes/FixNDisplayStereoDevice.h similarity index 92% rename from Source/DisplayClusterExtensions/Public/Fixes/FixNDisplayStereoDevice.h rename to Source/RWTHVRToolkit/Public/Fixes/FixNDisplayStereoDevice.h index 35c82417..81761f9d 100644 --- a/Source/DisplayClusterExtensions/Public/Fixes/FixNDisplayStereoDevice.h +++ b/Source/RWTHVRToolkit/Public/Fixes/FixNDisplayStereoDevice.h @@ -12,7 +12,7 @@ * For this behavior a Pull-Request is in progress. See https://github.com/EpicGames/UnrealEngine/pull/7738 */ USTRUCT() -struct DISPLAYCLUSTEREXTENSIONS_API FFixNDisplayStereoDevice +struct RWTHVRTOOLKIT_API FFixNDisplayStereoDevice { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/Clickable.h b/Source/RWTHVRToolkit/Public/Interaction/Clickable.h similarity index 87% rename from Source/DisplayClusterExtensions/Public/Interaction/Clickable.h rename to Source/RWTHVRToolkit/Public/Interaction/Clickable.h index 7117f459..e4cba4a1 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/Clickable.h +++ b/Source/RWTHVRToolkit/Public/Interaction/Clickable.h @@ -8,7 +8,7 @@ #include "Clickable.generated.h" UINTERFACE(BlueprintType) -class DISPLAYCLUSTEREXTENSIONS_API UClickable : public UInterface +class RWTHVRTOOLKIT_API UClickable : public UInterface { // has to be empty, this is Unreals syntax to make it visible in blueprints GENERATED_UINTERFACE_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/Grabable.h b/Source/RWTHVRToolkit/Public/Interaction/Grabable.h similarity index 88% rename from Source/DisplayClusterExtensions/Public/Interaction/Grabable.h rename to Source/RWTHVRToolkit/Public/Interaction/Grabable.h index c25c7648..24d6da6d 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/Grabable.h +++ b/Source/RWTHVRToolkit/Public/Interaction/Grabable.h @@ -8,7 +8,7 @@ #include "Grabable.generated.h" UINTERFACE(BlueprintType) -class DISPLAYCLUSTEREXTENSIONS_API UGrabable : public UInterface +class RWTHVRTOOLKIT_API UGrabable : public UInterface { // has to be empty, this is Unreals syntax to make it visible in blueprints GENERATED_UINTERFACE_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorComponent.h b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorComponent.h similarity index 91% rename from Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorComponent.h rename to Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorComponent.h index 8f28127d..4df96ed8 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorComponent.h +++ b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorComponent.h @@ -8,7 +8,7 @@ UCLASS(Abstract, ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class DISPLAYCLUSTEREXTENSIONS_API UGrabbingBehaviorComponent : public USceneComponent +class RWTHVRTOOLKIT_API UGrabbingBehaviorComponent : public USceneComponent { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnLineComponent.h b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnLineComponent.h similarity index 91% rename from Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnLineComponent.h rename to Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnLineComponent.h index ad49e230..0e470126 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnLineComponent.h +++ b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnLineComponent.h @@ -8,7 +8,7 @@ UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class DISPLAYCLUSTEREXTENSIONS_API UGrabbingBehaviorOnLineComponent : public UGrabbingBehaviorComponent +class RWTHVRTOOLKIT_API UGrabbingBehaviorOnLineComponent : public UGrabbingBehaviorComponent { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h similarity index 90% rename from Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h rename to Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h index d37120b7..80a52f34 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h +++ b/Source/RWTHVRToolkit/Public/Interaction/GrabbingBehaviorOnPlaneComponent.h @@ -8,7 +8,7 @@ UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class DISPLAYCLUSTEREXTENSIONS_API UGrabbingBehaviorOnPlaneComponent : public UGrabbingBehaviorComponent +class RWTHVRTOOLKIT_API UGrabbingBehaviorOnPlaneComponent : public UGrabbingBehaviorComponent { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Interaction/Targetable.h b/Source/RWTHVRToolkit/Public/Interaction/Targetable.h similarity index 93% rename from Source/DisplayClusterExtensions/Public/Interaction/Targetable.h rename to Source/RWTHVRToolkit/Public/Interaction/Targetable.h index 334eebb3..027615e2 100644 --- a/Source/DisplayClusterExtensions/Public/Interaction/Targetable.h +++ b/Source/RWTHVRToolkit/Public/Interaction/Targetable.h @@ -8,7 +8,7 @@ #include "Targetable.generated.h" UINTERFACE(BlueprintType) -class DISPLAYCLUSTEREXTENSIONS_API UTargetable: public UInterface +class RWTHVRTOOLKIT_API UTargetable: public UInterface { // has to be empty, this is Unreals syntax to make it visible in blueprints GENERATED_UINTERFACE_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Pawn/BasicVRInteractionComponent.h b/Source/RWTHVRToolkit/Public/Pawn/BasicVRInteractionComponent.h similarity index 94% rename from Source/DisplayClusterExtensions/Public/Pawn/BasicVRInteractionComponent.h rename to Source/RWTHVRToolkit/Public/Pawn/BasicVRInteractionComponent.h index b096d5f7..9b100179 100644 --- a/Source/DisplayClusterExtensions/Public/Pawn/BasicVRInteractionComponent.h +++ b/Source/RWTHVRToolkit/Public/Pawn/BasicVRInteractionComponent.h @@ -20,7 +20,7 @@ enum EInteractionRayVisibility UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class DISPLAYCLUSTEREXTENSIONS_API UBasicVRInteractionComponent : public UWidgetInteractionComponent +class RWTHVRTOOLKIT_API UBasicVRInteractionComponent : public UWidgetInteractionComponent { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Pawn/UniversalTrackedComponent.h b/Source/RWTHVRToolkit/Public/Pawn/UniversalTrackedComponent.h similarity index 93% rename from Source/DisplayClusterExtensions/Public/Pawn/UniversalTrackedComponent.h rename to Source/RWTHVRToolkit/Public/Pawn/UniversalTrackedComponent.h index 8807ef20..bd45437b 100644 --- a/Source/DisplayClusterExtensions/Public/Pawn/UniversalTrackedComponent.h +++ b/Source/RWTHVRToolkit/Public/Pawn/UniversalTrackedComponent.h @@ -32,7 +32,7 @@ enum class EAttachementType : uint8 */ UCLASS( ClassGroup=(Custom), meta=(BlueprintSpawnableComponent) ) -class DISPLAYCLUSTEREXTENSIONS_API UUniversalTrackedComponent : public USceneComponent +class RWTHVRTOOLKIT_API UUniversalTrackedComponent : public USceneComponent { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Pawn/VRPawnMovement.h b/Source/RWTHVRToolkit/Public/Pawn/VRPawnMovement.h similarity index 94% rename from Source/DisplayClusterExtensions/Public/Pawn/VRPawnMovement.h rename to Source/RWTHVRToolkit/Public/Pawn/VRPawnMovement.h index d90c30c7..b11d46f6 100644 --- a/Source/DisplayClusterExtensions/Public/Pawn/VRPawnMovement.h +++ b/Source/RWTHVRToolkit/Public/Pawn/VRPawnMovement.h @@ -29,7 +29,7 @@ enum class EVRNavigationModes : uint8 }; UCLASS() -class DISPLAYCLUSTEREXTENSIONS_API UVRPawnMovement : public UFloatingPawnMovement +class RWTHVRTOOLKIT_API UVRPawnMovement : public UFloatingPawnMovement { GENERATED_UCLASS_BODY() diff --git a/Source/DisplayClusterExtensions/Public/Pawn/VirtualRealityPawn.h b/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h similarity index 94% rename from Source/DisplayClusterExtensions/Public/Pawn/VirtualRealityPawn.h rename to Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h index c37e7b85..9f027a03 100644 --- a/Source/DisplayClusterExtensions/Public/Pawn/VirtualRealityPawn.h +++ b/Source/RWTHVRToolkit/Public/Pawn/VirtualRealityPawn.h @@ -13,7 +13,7 @@ * */ UCLASS() -class DISPLAYCLUSTEREXTENSIONS_API AVirtualRealityPawn : public APawn +class RWTHVRTOOLKIT_API AVirtualRealityPawn : public APawn { GENERATED_BODY() public: diff --git a/Source/DisplayClusterExtensions/Public/DisplayClusterExtensions.h b/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h similarity index 82% rename from Source/DisplayClusterExtensions/Public/DisplayClusterExtensions.h rename to Source/RWTHVRToolkit/Public/RWTHVRToolkit.h index b906e564..3e0da836 100644 --- a/Source/DisplayClusterExtensions/Public/DisplayClusterExtensions.h +++ b/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h @@ -7,7 +7,7 @@ #include "Cluster/ClusterConsole.h" -class FDisplayClusterExtensionsModule : public IModuleInterface +class FRWTHVRToolkitModule : public IModuleInterface { public: virtual void StartupModule () override; diff --git a/Source/DisplayClusterExtensions/Public/Utility/VirtualRealityUtilities.h b/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h similarity index 94% rename from Source/DisplayClusterExtensions/Public/Utility/VirtualRealityUtilities.h rename to Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h index b05e9c29..07273f16 100644 --- a/Source/DisplayClusterExtensions/Public/Utility/VirtualRealityUtilities.h +++ b/Source/RWTHVRToolkit/Public/Utility/VirtualRealityUtilities.h @@ -28,7 +28,7 @@ enum class ENamedClusterComponent : uint8 }; UCLASS() -class DISPLAYCLUSTEREXTENSIONS_API UVirtualRealityUtilities : public UBlueprintFunctionLibrary +class RWTHVRTOOLKIT_API UVirtualRealityUtilities : public UBlueprintFunctionLibrary { GENERATED_BODY() diff --git a/Source/DisplayClusterExtensions/DisplayClusterExtensions.Build.cs b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs similarity index 77% rename from Source/DisplayClusterExtensions/DisplayClusterExtensions.Build.cs rename to Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs index dda37d95..2e2f428c 100644 --- a/Source/DisplayClusterExtensions/DisplayClusterExtensions.Build.cs +++ b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs @@ -1,8 +1,8 @@ using UnrealBuildTool; -public class DisplayClusterExtensions : ModuleRules +public class RWTHVRToolkit : ModuleRules { - public DisplayClusterExtensions(ReadOnlyTargetRules Target) : base(Target) + public RWTHVRToolkit(ReadOnlyTargetRules Target) : base(Target) { PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs; @@ -31,10 +31,10 @@ public class DisplayClusterExtensions : ModuleRules "Engine", "HeadMountedDisplay", "InputCore", - "UMG", - "Slate", - "SlateCore", - "DeveloperSettings" + "UMG", + "Slate", + "SlateCore", + "DeveloperSettings" } ); diff --git a/Source/DisplayClusterExtensionsEditor/Private/Interaction/GrabbingBehaviorOnLineVisualizer.cpp b/Source/RWTHVRToolkitEditor/Private/Interaction/GrabbingBehaviorOnLineVisualizer.cpp similarity index 100% rename from Source/DisplayClusterExtensionsEditor/Private/Interaction/GrabbingBehaviorOnLineVisualizer.cpp rename to Source/RWTHVRToolkitEditor/Private/Interaction/GrabbingBehaviorOnLineVisualizer.cpp diff --git a/Source/DisplayClusterExtensionsEditor/Private/Interaction/GrabbingBehaviorPlaneVisualizer.cpp b/Source/RWTHVRToolkitEditor/Private/Interaction/GrabbingBehaviorPlaneVisualizer.cpp similarity index 100% rename from Source/DisplayClusterExtensionsEditor/Private/Interaction/GrabbingBehaviorPlaneVisualizer.cpp rename to Source/RWTHVRToolkitEditor/Private/Interaction/GrabbingBehaviorPlaneVisualizer.cpp diff --git a/Source/DisplayClusterExtensionsEditor/Private/DisplayClusterExtensionsEditor.cpp b/Source/RWTHVRToolkitEditor/Private/RWTHVRToolkitEditor.cpp similarity index 77% rename from Source/DisplayClusterExtensionsEditor/Private/DisplayClusterExtensionsEditor.cpp rename to Source/RWTHVRToolkitEditor/Private/RWTHVRToolkitEditor.cpp index bc1dccee..22e61495 100644 --- a/Source/DisplayClusterExtensionsEditor/Private/DisplayClusterExtensionsEditor.cpp +++ b/Source/RWTHVRToolkitEditor/Private/RWTHVRToolkitEditor.cpp @@ -1,4 +1,4 @@ -#include "DisplayClusterExtensionsEditor.h" +#include "RWTHVRToolkitEditor.h" #include "ComponentVisualizers.h" #include "Interaction/GrabbingBehaviorOnLineVisualizer.h" @@ -10,11 +10,11 @@ #include "UnrealEdGlobals.h" #include "Editor/UnrealEdEngine.h" -IMPLEMENT_GAME_MODULE(FDisplayClusterExtensionsEditorModule, DisplayClusterExtensionsEditor); +IMPLEMENT_GAME_MODULE(FRWTHVRToolkitEditorModule, RWTHVRToolkitEditor); -#define LOCTEXT_NAMESPACE "DisplayClusterExtensionsEdito" +#define LOCTEXT_NAMESPACE "RWTHVRToolkitEdito" -void FDisplayClusterExtensionsEditorModule::StartupModule() +void FRWTHVRToolkitEditorModule::StartupModule() { if (GUnrealEd != NULL) { @@ -36,7 +36,7 @@ void FDisplayClusterExtensionsEditorModule::StartupModule() } } -void FDisplayClusterExtensionsEditorModule::ShutdownModule() +void FRWTHVRToolkitEditorModule::ShutdownModule() { if (GUnrealEd != NULL) { diff --git a/Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h b/Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h similarity index 80% rename from Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h rename to Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h index 60257dbd..7cb7de8c 100644 --- a/Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h +++ b/Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorOnLineVisualizer.h @@ -10,7 +10,7 @@ class FPrimitiveDrawInterface; class FSceneView; -class DISPLAYCLUSTEREXTENSIONSEDITOR_API FGrabbingBehaviorOnLineVisualizer : public FComponentVisualizer +class RWTHVRTOOLKITEDITOR_API FGrabbingBehaviorOnLineVisualizer : public FComponentVisualizer { public: FGrabbingBehaviorOnLineVisualizer(); diff --git a/Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h b/Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h similarity index 80% rename from Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h rename to Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h index 517bb3ca..db020e56 100644 --- a/Source/DisplayClusterExtensionsEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h +++ b/Source/RWTHVRToolkitEditor/Public/Interaction/GrabbingBehaviorPlaneVisualizer.h @@ -10,7 +10,7 @@ class FPrimitiveDrawInterface; class FSceneView; -class DISPLAYCLUSTEREXTENSIONSEDITOR_API FGrabbingBehaviorPlaneVisualizer : public FComponentVisualizer +class RWTHVRTOOLKITEDITOR_API FGrabbingBehaviorPlaneVisualizer : public FComponentVisualizer { public: FGrabbingBehaviorPlaneVisualizer(); diff --git a/Source/DisplayClusterExtensionsEditor/Public/DisplayClusterExtensionsEditor.h b/Source/RWTHVRToolkitEditor/Public/RWTHVRToolkitEditor.h similarity index 77% rename from Source/DisplayClusterExtensionsEditor/Public/DisplayClusterExtensionsEditor.h rename to Source/RWTHVRToolkitEditor/Public/RWTHVRToolkitEditor.h index 5821955a..0effe932 100644 --- a/Source/DisplayClusterExtensionsEditor/Public/DisplayClusterExtensionsEditor.h +++ b/Source/RWTHVRToolkitEditor/Public/RWTHVRToolkitEditor.h @@ -4,7 +4,7 @@ #include "Modules/ModuleInterface.h" #include "Modules/ModuleManager.h" -class FDisplayClusterExtensionsEditorModule : public IModuleInterface +class FRWTHVRToolkitEditorModule : public IModuleInterface { public: // Begin IModuleInterface implementation diff --git a/Source/DisplayClusterExtensionsEditor/DIsplayClusterExtensionsEditor.Build.cs b/Source/RWTHVRToolkitEditor/RWTHVRToolkitEditor.Build.cs similarity index 86% rename from Source/DisplayClusterExtensionsEditor/DIsplayClusterExtensionsEditor.Build.cs rename to Source/RWTHVRToolkitEditor/RWTHVRToolkitEditor.Build.cs index 7a96cbaf..f2b52dc9 100644 --- a/Source/DisplayClusterExtensionsEditor/DIsplayClusterExtensionsEditor.Build.cs +++ b/Source/RWTHVRToolkitEditor/RWTHVRToolkitEditor.Build.cs @@ -1,8 +1,8 @@ using UnrealBuildTool; -public class DisplayClusterExtensionsEditor : ModuleRules +public class RWTHVRToolkitEditor : ModuleRules { - public DisplayClusterExtensionsEditor(ReadOnlyTargetRules Target) : base(Target) + public RWTHVRToolkitEditor(ReadOnlyTargetRules Target) : base(Target) { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; @@ -17,7 +17,7 @@ public class DisplayClusterExtensionsEditor : ModuleRules "ComponentVisualizers", "HeadMountedDisplay", "InputCore", - "DisplayClusterExtensions" + "RWTHVRToolkit" // ... add public dependencies that you statically link with here ... -- GitLab