From ffc532f4c210696b8979562817addaaf644a1c31 Mon Sep 17 00:00:00 2001
From: Sebastian Pape <pape@vr.rwth-aachen.de>
Date: Thu, 26 Aug 2021 15:13:51 +0200
Subject: [PATCH] Moving the cluster folder to its own module and fixing the
redirects in DoorOverlay
---
Content/CAVEOverlay/DoorOverlay.uasset | Bin 26191 -> 26138 bytes
RWTHVRToolkit.uplugin | 89 ++++++++++--------
Source/Calibratio/Public/CalibratioActor.h | 2 +-
.../Private}/CAVEOverlay/CAVEOverlay.cpp | 2 +-
.../CAVEOverlay/CAVEOverlayController.cpp | 4 +-
.../Private}/ClusterConsole.cpp | 2 +-
.../RWTHVRCluster/Private/RWTHVRCluster.cpp | 18 ++++
.../Public}/CAVEOverlay/CAVEOverlay.h | 6 +-
.../CAVEOverlay/CAVEOverlayController.h | 4 +-
.../Public}/CAVEOverlay/CAVEOverlaySettings.h | 2 +-
.../Public}/CAVEOverlay/DoorOverlayData.h | 2 +-
.../Public}/ClusterConsole.h | 2 +-
.../DisplayClusterEventParameterHelper.h | 0
.../Events/DisplayClusterEventWrapper.h | 0
Source/RWTHVRCluster/Public/RWTHVRCluster.h | 17 ++++
Source/RWTHVRCluster/RWTHVRCluster.Build.cs | 41 ++++++++
.../RWTHVRToolkit/Private/RWTHVRToolkit.cpp | 4 -
.../Utility/VirtualRealityUtilities.cpp | 2 +-
Source/RWTHVRToolkit/Public/RWTHVRToolkit.h | 5 -
Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs | 4 +-
20 files changed, 143 insertions(+), 63 deletions(-)
rename Source/{RWTHVRToolkit/Private/Cluster => RWTHVRCluster/Private}/CAVEOverlay/CAVEOverlay.cpp (93%)
rename Source/{RWTHVRToolkit/Private/Cluster => RWTHVRCluster/Private}/CAVEOverlay/CAVEOverlayController.cpp (99%)
rename Source/{RWTHVRToolkit/Private/Cluster => RWTHVRCluster/Private}/ClusterConsole.cpp (95%)
create mode 100644 Source/RWTHVRCluster/Private/RWTHVRCluster.cpp
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/CAVEOverlay/CAVEOverlay.h (75%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/CAVEOverlay/CAVEOverlayController.h (95%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/CAVEOverlay/CAVEOverlaySettings.h (89%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/CAVEOverlay/DoorOverlayData.h (88%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/ClusterConsole.h (91%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/Events/DisplayClusterEventParameterHelper.h (100%)
rename Source/{RWTHVRToolkit/Public/Cluster => RWTHVRCluster/Public}/Events/DisplayClusterEventWrapper.h (100%)
create mode 100644 Source/RWTHVRCluster/Public/RWTHVRCluster.h
create mode 100644 Source/RWTHVRCluster/RWTHVRCluster.Build.cs
diff --git a/Content/CAVEOverlay/DoorOverlay.uasset b/Content/CAVEOverlay/DoorOverlay.uasset
index 8e78c0e895f8b30376111b947b007dbdbc9d7d68..a5f77236ed84ef757a4d40f5dfc23acfe14e972c 100644
GIT binary patch
delta 1088
zcmX?qhH=&z#t9P`1t(7QG?*mFz#z%Mz`)1Hzz`(Oz`)4Bz)&Q^z)&T_z|bYbz)+L%
zynCa@WS1$60=NH9ky<>Ni&24<iQ(6-&yxcfB__Kw8tQG6VPFtTV?Y7_|Ns9lXvx5!
z&cMK+9~2(q5f&7ZpP!SRSu*)Pql7qv=eK>T#@OUkS!$ogOq<NXWNpe1k`GQU$}A|+
zcg;)B%u8ixb7=JxLlTCV?3`0tT#{PE5P0!_(dK3*1s+DD$qjt+jBh6|;8WiGoX><&
zkQM4WLn!@rvyQ-gMkYba$rlB+CO;5lnfzXiXL7y}$7FsX6{dbGG+`YkUK=zak;$)x
zB$(<@h3$oPnBJoc$p|qqFfed1Ffe=pg)RdFL$Do+Vf-RGOzsXSLia^vgg}Zxx>7(4
z1_p)+j%Z4Bn7%ln3CRetK<)B`>U!aVqGY|O4wIo9iV(=x-l;s3wZ$Zua#5w~#Z<UB
zK_)UVFetgB=&Bb(_{)<S60F+ZC`$arRk-Y-Az$K$A_cN@zqkt1=HST(d=U{KFQLP<
zISxgoyoAK$`4S>bYvWOb-%IE)wI!elNlea{6k%#eL=oOEslybR1hz(8N=E7T|Ns9X
zu4P~_fHF847#P~2?8_-Ay8EScn4(hAghVEDOG_~AKoQ;?FP*{2S|`K6z_|I0OgJNB
z$Yd2cC0<AhMWlU|$u)8!^12KR49+=;#l`CS&;$-q2TjS7cgblGQnQ&yUQ>$si?8Tr
z3(I;z9#IAc2G3%b)Z)zayv;|wo-j@3PvMySTbyU|Uf&f+Y~9JR-szip{iT`NoER7w
zd@CpG2mRnS0qM?jNzExq+-wqjm!B0BN|KZRyUJ`fN|t0|0dXf^6cm}9ocaa;xLi#h
delta 865
zcmbPrhVlFv#t9P`9VbroG*~Xkz#z%Mz@W^>z>qG@z`)4Bz|bzkz|b$lz%XBifkEd-
z#Jk=&1Bd-Djqa`SxchK27o);tZ${b4?u>@Ur)3xzywey^!2kdM|2tYTFz7HaFzDyG
zWEL0XBv!gsl%(brXXfV>PqvejkYTWnZQW^sQ-KOAgLAR-<jMaStsN9Ws)Cb?G7C!d
zp@uo<lopqy79q@JxH7ebj~_{)YhHS0UMfSIL#yZJJSGL6$(#5TSl|Bt|KDh`Jiqeh
zYkUTbqAXBX8$#)K|NsBjnrttiyxC5mf|1G5a`Hi8-O0W}qLY6Ksxa-hf^sdHY;B-S
z#mU!%B$(DgxU#~QO!Bs18ChY?$?Jp#n40at+_%D(Oyv$>=3Wua$#o(EOa~mHTuUYu
zXDCy1vY)5`lY}dn+be3xl;{R#`U;6M{+`S&rpz=KA`mNP$i)qHeULj?O{|#a<ac5M
zOtIczuCBNtmlG?*U(5W!LLh&v5?5h*5j>gETWj(KL6*t?#4VU!#DQi1imOiUk`Q5f
z6c6T}m9S*mod9L3PL7fkVcMDq=FXM0Wa>)-8^I(c!}w>iyp%i>M=Dq@SIUy9AI4Oi
z{7p)N=`EPM*;cxgk#({R1B2n_?K0tvjFFT1<&=c5rVR@%P_l5&Nh~f_*C!C|lc&mQ
zkf40?9XU-Y<~P2=n>j4&1^L7o7#KW@6<kt_Gt=`FHc$3?!Zi6nfaByHzSUq_+dF;p
zZ9i#dc4r0#2H#4B$$tWW@S1@%<tezN=9DBVZ2li~m!I*^=DSIjOq039cqX3|<e99O
G`UU__7#Fty
diff --git a/RWTHVRToolkit.uplugin b/RWTHVRToolkit.uplugin
index 690ed435..8c94abd9 100644
--- a/RWTHVRToolkit.uplugin
+++ b/RWTHVRToolkit.uplugin
@@ -1,40 +1,53 @@
{
- "FileVersion": 3,
- "Version": 1,
- "VersionName": "1.0",
- "FriendlyName": "RWTH VR Toolkit",
- "Description": "",
- "Category": "Other",
- "CreatedBy": "",
- "CreatedByURL": "",
- "DocsURL": "",
- "MarketplaceURL": "",
- "SupportURL": "",
- "CanContainContent": true,
- "IsBetaVersion": false,
- "Installed": false,
- "EnabledByDefault": true,
- "Modules": [
- {
- "Name": "Calibratio",
- "Type": "Runtime",
- "LoadingPhase": "Default"
- },
- {
- "Name": "RWTHVRToolkit",
- "Type": "Runtime",
- "LoadingPhase": "Default"
- },
- {
- "Name": "RWTHVRToolkitEditor",
- "Type": "Editor",
- "LoadingPhase": "PostEngineInit"
- }
- ],
- "Plugins": [
- {
- "Name": "nDisplay",
- "Enabled": true
- }
- ]
+ "FileVersion": 3,
+ "Version": 1,
+ "VersionName": "1.0",
+ "FriendlyName": "RWTH VR Toolkit",
+ "Description": "",
+ "Category": "Other",
+ "CreatedBy": "",
+ "CreatedByURL": "",
+ "DocsURL": "",
+ "MarketplaceURL": "",
+ "SupportURL": "",
+ "CanContainContent": true,
+ "IsBetaVersion": false,
+ "Installed": false,
+ "EnabledByDefault": true,
+ "Modules": [
+ {
+ "Name": "Calibratio",
+ "Type": "Runtime",
+ "LoadingPhase": "Default",
+ "WhitelistPlatforms": [
+ "Win64",
+ "Linux"
+ ]
+ },
+ {
+ "Name": "RWTHVRCluster",
+ "Type": "Runtime",
+ "LoadingPhase": "Default",
+ "WhitelistPlatforms": [
+ "Win64",
+ "Linux"
+ ]
+ },
+ {
+ "Name": "RWTHVRToolkit",
+ "Type": "Runtime",
+ "LoadingPhase": "Default"
+ },
+ {
+ "Name": "RWTHVRToolkitEditor",
+ "Type": "Editor",
+ "LoadingPhase": "PostEngineInit"
+ }
+ ],
+ "Plugins": [
+ {
+ "Name": "nDisplay",
+ "Enabled": true
+ }
+ ]
}
\ No newline at end of file
diff --git a/Source/Calibratio/Public/CalibratioActor.h b/Source/Calibratio/Public/CalibratioActor.h
index a2bac0d1..bb59fb15 100644
--- a/Source/Calibratio/Public/CalibratioActor.h
+++ b/Source/Calibratio/Public/CalibratioActor.h
@@ -62,7 +62,7 @@ private:
FVector LastVisiblePosition = FVector(NAN, NAN, NAN);
bool FirstPositionSet = false;
uint32 AcceptedAbscenceTime = 500u; // in Milliseconds
- UPROPERTY() UDisplayClusterSceneComponent* TrackedClusterComponent = nullptr;
+ UPROPERTY() USceneComponent* TrackedClusterComponent = nullptr;
//Overlay
TSubclassOf<class UCalibratioOverlay> Overlay_Class;
diff --git a/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlay.cpp
similarity index 93%
rename from Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp
rename to Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlay.cpp
index 6d1aaf8b..75db39b1 100644
--- a/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlay.cpp
+++ b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlay.cpp
@@ -1,6 +1,6 @@
// Copyright 1998-2019 Epic Games, Inc. All Rights Reserved.
-#include "Cluster/CAVEOverlay/CAVEOverlay.h"
+#include "CAVEOverlay/CAVEOverlay.h"
void FCAVEOverlay::Register()
{
diff --git a/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
similarity index 99%
rename from Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp
rename to Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
index 96b53f97..fe76403a 100644
--- a/Source/RWTHVRToolkit/Private/Cluster/CAVEOverlay/CAVEOverlayController.cpp
+++ b/Source/RWTHVRCluster/Private/CAVEOverlay/CAVEOverlayController.cpp
@@ -1,6 +1,6 @@
-#include "Cluster/CAVEOverlay/CAVEOverlayController.h"
+#include "CAVEOverlay/CAVEOverlayController.h"
#include "CoreMinimal.h"
-#include "Cluster/CAVEOverlay/DoorOverlayData.h"
+#include "CAVEOverlay/DoorOverlayData.h"
#include "IDisplayCluster.h"
#include "IXRTrackingSystem.h"
#include "Cluster/IDisplayClusterClusterManager.h"
diff --git a/Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp b/Source/RWTHVRCluster/Private/ClusterConsole.cpp
similarity index 95%
rename from Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp
rename to Source/RWTHVRCluster/Private/ClusterConsole.cpp
index 966f4f01..200e7904 100644
--- a/Source/RWTHVRToolkit/Private/Cluster/ClusterConsole.cpp
+++ b/Source/RWTHVRCluster/Private/ClusterConsole.cpp
@@ -1,4 +1,4 @@
-#include "Cluster/ClusterConsole.h"
+#include "ClusterConsole.h"
#include "IDisplayCluster.h"
#include "Cluster/DisplayClusterClusterEvent.h"
diff --git a/Source/RWTHVRCluster/Private/RWTHVRCluster.cpp b/Source/RWTHVRCluster/Private/RWTHVRCluster.cpp
new file mode 100644
index 00000000..6aa76eeb
--- /dev/null
+++ b/Source/RWTHVRCluster/Private/RWTHVRCluster.cpp
@@ -0,0 +1,18 @@
+#include "RWTHVRCluster.h"
+
+#define LOCTEXT_NAMESPACE "FRWTHVRClusterModule"
+
+void FRWTHVRClusterModule::StartupModule ()
+{
+ ClusterConsole.Register();
+ CAVEOverlay.Register();
+}
+void FRWTHVRClusterModule::ShutdownModule()
+{
+ ClusterConsole.Unregister();
+ CAVEOverlay.Unregister();
+}
+
+#undef LOCTEXT_NAMESPACE
+
+IMPLEMENT_MODULE(FRWTHVRClusterModule, RWTHVRCluster)
\ No newline at end of file
diff --git a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlay.h
similarity index 75%
rename from Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h
rename to Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlay.h
index c84304d4..daed2343 100644
--- a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlay.h
+++ b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlay.h
@@ -2,8 +2,8 @@
#include "CoreMinimal.h"
#include "Engine/World.h"
-#include "Cluster/CAVEOverlay/CAVEOverlaySettings.h"
-#include "Cluster/CAVEOverlay/CAVEOverlayController.h"
+#include "CAVEOverlay/CAVEOverlaySettings.h"
+#include "CAVEOverlay/CAVEOverlayController.h"
#include "Kismet/GameplayStatics.h"
#include "CAVEOverlay.generated.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 RWTHVRTOOLKIT_API FCAVEOverlay
+struct RWTHVRCLUSTER_API FCAVEOverlay
{
GENERATED_BODY()
diff --git a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlayController.h
similarity index 95%
rename from Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h
rename to Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlayController.h
index 74d41de0..1ac575b6 100644
--- a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlayController.h
+++ b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlayController.h
@@ -2,7 +2,7 @@
#include "CoreMinimal.h"
#include "GameFramework/Actor.h"
-#include "Cluster/CAVEOverlay/DoorOverlayData.h"
+#include "CAVEOverlay/DoorOverlayData.h"
#include "Cluster/IDisplayClusterClusterManager.h"
#include "Cluster/DisplayClusterClusterEvent.h"
#include "CAVEOverlayController.generated.h"
@@ -10,7 +10,7 @@
DECLARE_LOG_CATEGORY_EXTERN(LogCAVEOverlay, Log, All);
UCLASS()
-class RWTHVRTOOLKIT_API ACAVEOverlayController : public AActor
+class RWTHVRCLUSTER_API ACAVEOverlayController : public AActor
{
GENERATED_BODY()
diff --git a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlaySettings.h
similarity index 89%
rename from Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h
rename to Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlaySettings.h
index f086b9df..5c3a81db 100644
--- a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/CAVEOverlaySettings.h
+++ b/Source/RWTHVRCluster/Public/CAVEOverlay/CAVEOverlaySettings.h
@@ -11,7 +11,7 @@ enum DefaultActivationType
};
UCLASS(config=Game, defaultconfig, meta=(DisplayName="CAVE Overlay"))
-class RWTHVRTOOLKIT_API UCAVEOverlaySettings : public UDeveloperSettings
+class RWTHVRCLUSTER_API UCAVEOverlaySettings : public UDeveloperSettings
{
GENERATED_BODY()
diff --git a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h b/Source/RWTHVRCluster/Public/CAVEOverlay/DoorOverlayData.h
similarity index 88%
rename from Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h
rename to Source/RWTHVRCluster/Public/CAVEOverlay/DoorOverlayData.h
index 56ca400a..a9d9d380 100644
--- a/Source/RWTHVRToolkit/Public/Cluster/CAVEOverlay/DoorOverlayData.h
+++ b/Source/RWTHVRCluster/Public/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 RWTHVRTOOLKIT_API UDoorOverlayData : public UUserWidget
+class RWTHVRCLUSTER_API UDoorOverlayData : public UUserWidget
{
GENERATED_BODY()
diff --git a/Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h b/Source/RWTHVRCluster/Public/ClusterConsole.h
similarity index 91%
rename from Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h
rename to Source/RWTHVRCluster/Public/ClusterConsole.h
index 700dceb5..81faf82f 100644
--- a/Source/RWTHVRToolkit/Public/Cluster/ClusterConsole.h
+++ b/Source/RWTHVRCluster/Public/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 RWTHVRTOOLKIT_API FClusterConsole
+struct RWTHVRCLUSTER_API FClusterConsole
{
GENERATED_BODY()
private:
diff --git a/Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventParameterHelper.h b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h
similarity index 100%
rename from Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventParameterHelper.h
rename to Source/RWTHVRCluster/Public/Events/DisplayClusterEventParameterHelper.h
diff --git a/Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventWrapper.h b/Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
similarity index 100%
rename from Source/RWTHVRToolkit/Public/Cluster/Events/DisplayClusterEventWrapper.h
rename to Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
diff --git a/Source/RWTHVRCluster/Public/RWTHVRCluster.h b/Source/RWTHVRCluster/Public/RWTHVRCluster.h
new file mode 100644
index 00000000..55849a21
--- /dev/null
+++ b/Source/RWTHVRCluster/Public/RWTHVRCluster.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "CAVEOverlay/CAVEOverlay.h"
+#include "Modules/ModuleManager.h"
+#include "ClusterConsole.h"
+
+class FRWTHVRClusterModule : public IModuleInterface
+{
+public:
+ virtual void StartupModule () override;
+ virtual void ShutdownModule() override;
+
+private:
+ FClusterConsole ClusterConsole;
+ FCAVEOverlay CAVEOverlay;
+};
diff --git a/Source/RWTHVRCluster/RWTHVRCluster.Build.cs b/Source/RWTHVRCluster/RWTHVRCluster.Build.cs
new file mode 100644
index 00000000..64f40ab0
--- /dev/null
+++ b/Source/RWTHVRCluster/RWTHVRCluster.Build.cs
@@ -0,0 +1,41 @@
+using UnrealBuildTool;
+
+public class RWTHVRCluster : ModuleRules
+{
+ public RWTHVRCluster(ReadOnlyTargetRules Target) : base(Target)
+ {
+ PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
+
+ PublicIncludePaths.AddRange(
+ new string[]{}
+ );
+
+ PrivateIncludePaths.AddRange(
+ new string[]{}
+ );
+
+ PublicDependencyModuleNames.AddRange(
+ new string[]
+ {
+ "Core",
+ "CoreUObject",
+ "Engine",
+ "RWTHVRToolkit",
+ "DisplayCluster",
+ "DeveloperSettings",
+ "InputCore",
+ "UMG",
+ "Slate",
+ "SlateCore"
+ }
+ );
+
+ PrivateDependencyModuleNames.AddRange(
+ new string[]{}
+ );
+
+ DynamicallyLoadedModuleNames.AddRange(
+ new string[] { }
+ );
+ }
+}
diff --git a/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp b/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp
index bf76c57c..10abfc9a 100644
--- a/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp
+++ b/Source/RWTHVRToolkit/Private/RWTHVRToolkit.cpp
@@ -4,14 +4,10 @@
void FRWTHVRToolkitModule::StartupModule ()
{
- ClusterConsole.Register();
- CAVEOverlay.Register();
ConsoleActivation.Register();
}
void FRWTHVRToolkitModule::ShutdownModule()
{
- ClusterConsole.Unregister();
- CAVEOverlay.Unregister();
ConsoleActivation.Unregister();
}
diff --git a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
index 2260a1e7..83caec4b 100644
--- a/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
+++ b/Source/RWTHVRToolkit/Private/Utility/VirtualRealityUtilities.cpp
@@ -115,7 +115,7 @@ EEyeStereoOffset UVirtualRealityUtilities::GetNodeEyeType()
{
#if PLATFORM_SUPPORTS_NDISPLAY
ADisplayClusterRootActor* RootActor = IDisplayCluster::Get().GetGameMgr()->GetRootActor();
- return (RootActor) ? RootActor->GetDefaultCamera()->GetStereoOffset() : EDisplayClusterEyeStereoOffset::None;
+ return static_cast<EEyeStereoOffset>((RootActor) ? RootActor->GetDefaultCamera()->GetStereoOffset() : EDisplayClusterEyeStereoOffset::None);
#else
return None;
#endif
diff --git a/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h b/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h
index eb0b6662..56caf39b 100644
--- a/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h
+++ b/Source/RWTHVRToolkit/Public/RWTHVRToolkit.h
@@ -1,12 +1,9 @@
#pragma once
#include "CoreMinimal.h"
-#include "Cluster/CAVEOverlay/CAVEOverlay.h"
#include "Modules/ModuleManager.h"
-#include "Cluster/ClusterConsole.h"
#include "Fixes/ActivateConsoleInShipping.h"
-
class FRWTHVRToolkitModule : public IModuleInterface
{
public:
@@ -14,7 +11,5 @@ public:
virtual void ShutdownModule() override;
private:
- FClusterConsole ClusterConsole;
- FCAVEOverlay CAVEOverlay;
FActivateConsoleInShipping ConsoleActivation;
};
diff --git a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
index dae59486..8326044a 100644
--- a/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
+++ b/Source/RWTHVRToolkit/RWTHVRToolkit.Build.cs
@@ -40,8 +40,8 @@ public class RWTHVRToolkit : ModuleRules
if(Target.Platform == UnrealTargetPlatform.Win64 || Target.Platform == UnrealTargetPlatform.Linux)
{
- //PublicDependencyModuleNames.Add("DisplayCluster");
- PublicDefinitions.Add("PLATFORM_SUPPORTS_NDISPLAY=0");
+ PublicDependencyModuleNames.Add("DisplayCluster");
+ PublicDefinitions.Add("PLATFORM_SUPPORTS_NDISPLAY=1");
}
else
{
--
GitLab