Skip to content
Snippets Groups Projects
Commit 4cd42030 authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Merge branch 'fix/errors_from_study_backport' into 'main'

Removing errors from back-porting

See merge request !3
parents a0e7380e d83a1d90
Branches main
No related tags found
1 merge request!3Removing errors from back-porting
...@@ -25,10 +25,6 @@ ...@@ -25,10 +25,6 @@
{ {
"Name": "nDisplay", "Name": "nDisplay",
"Enabled": true "Enabled": true
},
{
"Name": "RWTHVRToolkit",
"Enabled": true
} }
] ]
} }
...@@ -42,9 +42,7 @@ public class DasherVR : ModuleRules ...@@ -42,9 +42,7 @@ public class DasherVR : ModuleRules
"Slate", "Slate",
"SlateCore", "SlateCore",
"UMG", "UMG",
"RenderCore", "RenderCore"
"DisplayCluster",
"RWTHVRToolkit"
// ... add private dependencies that you statically link with here ... // ... add private dependencies that you statically link with here ...
} }
); );
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "Math/Vector2D.h" #include "Math/Vector2D.h"
#include "Fonts/FontMeasure.h" #include "Fonts/FontMeasure.h"
#include "Widgets/DeclarativeSyntaxSupport.h" #include "Widgets/DeclarativeSyntaxSupport.h"
#include "Cluster/IDisplayClusterClusterManager.h"
//using namespace Dasher; //using namespace Dasher;
...@@ -194,10 +193,6 @@ private: ...@@ -194,10 +193,6 @@ private:
//set up the font measure service to ... measure fonts. //set up the font measure service to ... measure fonts.
TSharedPtr<FSlateFontMeasure> FontMeasureService; TSharedPtr<FSlateFontMeasure> FontMeasureService;
//CAVE Sync
FOnClusterEventBinaryListener ClusterEventListener;
inline static int32 DasherEventID = 424240;
protected: protected:
// stores color information // stores color information
TSharedPtr<Dasher::DasherInterface> DasherMainInterface; TSharedPtr<Dasher::DasherInterface> DasherMainInterface;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment