Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DasherVR
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LuFG VR VIS
VR-Group
Unreal-Development
Plugins
DasherVR
Commits
4cd42030
Commit
4cd42030
authored
10 months ago
by
Sebastian Pape
Browse files
Options
Downloads
Plain Diff
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
!3
Removing errors from back-porting
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
DasherVR.uplugin
+0
-4
0 additions, 4 deletions
DasherVR.uplugin
Source/DasherVR/DasherVR.Build.cs
+1
-3
1 addition, 3 deletions
Source/DasherVR/DasherVR.Build.cs
Source/DasherVR/Public/SDasherWidget.h
+0
-5
0 additions, 5 deletions
Source/DasherVR/Public/SDasherWidget.h
with
1 addition
and
12 deletions
DasherVR.uplugin
+
0
−
4
View file @
4cd42030
...
@@ -25,10 +25,6 @@
...
@@ -25,10 +25,6 @@
{
{
"Name": "nDisplay",
"Name": "nDisplay",
"Enabled": true
"Enabled": true
},
{
"Name": "RWTHVRToolkit",
"Enabled": true
}
}
]
]
}
}
This diff is collapsed.
Click to expand it.
Source/DasherVR/DasherVR.Build.cs
+
1
−
3
View file @
4cd42030
...
@@ -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 ...
}
}
);
);
...
...
This diff is collapsed.
Click to expand it.
Source/DasherVR/Public/SDasherWidget.h
+
0
−
5
View file @
4cd42030
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment