diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db2aaf642e8c820e93a1f9969b554fe9020e8f29..c0b420ee6433d9a9aca1618cc324b8250d7dc242 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 0000000000000000000000000000000000000000..739c6efcfc733ba66ee83a9706ee3758df1c0008
--- /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 1a729310cac5e51ac40529e89f0be81cb9121c08..d71a6e7199a6300536128d6c54783b18b8c4355d 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 2946b41be281b5c85b0ee8f558db44af2523f3c9..a0891804774aa9a6dc48313dedd275af7cd477fa 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
Binary files a/Resources/Icon128.png and b/Resources/Icon128.png differ
diff --git a/Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp b/Source/DisplayClusterExtensions/Private/DisplayClusterExtensions.cpp
deleted file mode 100644
index 68fb57e76d75f77682231de49407df9bd4dc3584..0000000000000000000000000000000000000000
--- 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 1d78376e2fa8aa55ae2597f59e913941906990dc..71251d1765a7797731356eed2cc8fb2ae49bc7bf 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 bd2bc48ec7039890767e60ba9a3c618f7849198b..b9e62ccb20e8a3da5749ef720637e1989b910381 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 0000000000000000000000000000000000000000..1b35313f6149bdfd35643d44764cb49f524d0c8d
--- /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 ced7309b750ac71fd756b6c023ffef621f97d415..c84304d4a6283fc37459a830c27bdffe88904b94 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 d73f121425cbb57cc73e9b962bdd80027e913d74..74d41de0c152f32bf77282f3955074fcef553869 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 307439a75a9eabf3d9209a9410a19529273af4b4..f086b9df45ad1f176c221de958e42eeda766330e 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 09bedc07913b5e0598ebf7d4aa0b45a0688337bd..56ca400a5b5039e72a51211e9990f3453a472a1f 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 21120d2c7e32619d9c0ccfa95d1c2e6642065520..700dceb5bc51d1e27db4d7714d20bce0d8f7aa2e 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 35c82417135afe67019a4c890ba9a7c6d0cf1025..81761f9df315466baccd090dfca962fc7ad903d4 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 7117f45935a00a9ee30098f407fe18d2147e992d..e4cba4a1fc0ee39f0d929204f55f446d0dfd7869 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 c25c7648727f67e99509689d75444adbdbffb7df..24d6da6dfb06ad982463e4a1594c19a31df56894 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 8f28127d23627cd14c2aa1a9586fc0e5652cea04..4df96ed82138da8e39ee92c68c38a5b54de610cc 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 ad49e2303a69fc428d6ad4c7d4e1ca8eb42fe29f..0e470126884bd3c69107499fb328d94579771f8d 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 d37120b788ce12fb8927b363ccf8aeca9c02275b..80a52f34e7eb5ede13c2ab721589c58a701402a8 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 334eebb35b1786d484a79c731c384a26dde1efe9..027615e261fedb5cf00da993187a5e864987143a 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 b096d5f74a1583dee359d4ba1c607fed97463e79..9b100179267c2bbb0a1f48571e42a75eb7811443 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 8807ef209851eb089d5e558c1fa198a3350f53f3..bd45437bc3d79571f36683a4c0d1ac1fe4deefde 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 d90c30c7ab47a8847590bb7894f8447f6642a58e..b11d46f6c9439979bf4a782ea87ca0dbdf324702 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 c37e7b85fc3f2d4f2f451cfc6ae1219789b120b7..9f027a03fe0cd0406687d7ac97adc0f7aaa58c7b 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 b906e564b2cbbde38fd6e530d4e8c31f3a0d46bc..3e0da836a6f873c48c5e4a8c3ef5475e8c0e352f 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 b05e9c295b35dffc49eb0c04174423fc0587f740..07273f16d7e78710f18103abacccc5be96941b10 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 dda37d956fe08677ec1919617367bdb2249f41c7..2e2f428c5d91089908de245476b542c0a8972a61 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 bc1dccee6411aa6937d246ee3abe02262762a8e2..22e614956f4810a3d4326318c5ac211d677ef861 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 60257dbd5fa090d7703c867a9d2c5f1a4b45e2b7..7cb7de8c1941ea5542bb9341c0b124348addeb95 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 517bb3ca97e066043f9de30b3fa103b6a236e305..db020e56f9af7fc06ccb906db0803347505d1b54 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 5821955a95b4702a41aaa5257dee4138b806b15e..0effe93208869a7327b30b31c88825d67aa7b9e6 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 7a96cbafacb2e141d57f368defa510b69fde4449..f2b52dc9f12da22f9ae1408f9a80139fd9fb654a 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 ...