Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
RWTH VR Toolkit
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
Releases
Package registry
Container 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
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
RWTH VR Toolkit
Commits
59aa41f6
Commit
59aa41f6
authored
10 months ago
by
David Gilbert
Browse files
Options
Downloads
Patches
Plain Diff
fix(cave): Adds #if guards around nDisplay code in Toolkit
parent
27e6d4f1
Branches
Branches containing commit
No related tags found
2 merge requests
!107
UE5.4-2024.1-rc1
,
!98
Improved join/attachment logic for clusters to support multi-cluster connections at some point
Pipeline
#440841
passed
10 months ago
Stage: generate
Stage: build
Stage: deploy
Changes
2
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Source/RWTHVRToolkit/Private/Pawn/ClusterRepresentationActor.cpp
+13
-13
13 additions, 13 deletions
...RWTHVRToolkit/Private/Pawn/ClusterRepresentationActor.cpp
Source/RWTHVRToolkit/Public/Pawn/ClusterRepresentationActor.h
+6
-1
6 additions, 1 deletion
...ce/RWTHVRToolkit/Public/Pawn/ClusterRepresentationActor.h
with
19 additions
and
14 deletions
Source/RWTHVRToolkit/Private/Pawn/ClusterRepresentationActor.cpp
+
13
−
13
View file @
59aa41f6
...
@@ -2,15 +2,17 @@
...
@@ -2,15 +2,17 @@
#include
"Pawn/ClusterRepresentationActor.h"
#include
"Pawn/ClusterRepresentationActor.h"
#include
"Core/RWTHVRPlayerState.h"
#include
"Kismet/GameplayStatics.h"
#include
"Logging/StructuredLog.h"
#include
"Utility/RWTHVRUtilities.h"
#if PLATFORM_SUPPORTS_CLUSTER
#include
"DisplayClusterRootActor.h"
#include
"DisplayClusterRootActor.h"
#include
"IDisplayCluster.h"
#include
"IDisplayCluster.h"
#include
"Config/IDisplayClusterConfigManager.h"
#include
"Config/IDisplayClusterConfigManager.h"
#include
"Core/RWTHVRPlayerState.h"
#include
"Game/IDisplayClusterGameManager.h"
#include
"Game/IDisplayClusterGameManager.h"
#include
"Kismet/GameplayStatics.h"
#endif
#include
"Logging/StructuredLog.h"
#include
"Utility/RWTHVRUtilities.h"
// Sets default values
// Sets default values
AClusterRepresentationActor
::
AClusterRepresentationActor
()
AClusterRepresentationActor
::
AClusterRepresentationActor
()
...
@@ -41,6 +43,8 @@ void AClusterRepresentationActor::AttachDCRAIfRequired(const ARWTHVRPlayerState*
...
@@ -41,6 +43,8 @@ void AClusterRepresentationActor::AttachDCRAIfRequired(const ARWTHVRPlayerState*
// - If we are a client, this actor has been spawned on the server only. Therefore I assume that if we
// - If we are a client, this actor has been spawned on the server only. Therefore I assume that if we
// have replicated this actor to our client, we're good to go.
// have replicated this actor to our client, we're good to go.
#if PLATFORM_SUPPORTS_CLUSTER
if
(
!
URWTHVRUtilities
::
IsRoomMountedMode
())
if
(
!
URWTHVRUtilities
::
IsRoomMountedMode
())
return
;
return
;
...
@@ -82,17 +86,12 @@ void AClusterRepresentationActor::AttachDCRAIfRequired(const ARWTHVRPlayerState*
...
@@ -82,17 +86,12 @@ void AClusterRepresentationActor::AttachDCRAIfRequired(const ARWTHVRPlayerState*
bIsAttached
=
AttachDCRA
();
bIsAttached
=
AttachDCRA
();
}
}
#endif
}
}
#if PLATFORM_SUPPORTS_CLUSTER
bool
AClusterRepresentationActor
::
AttachDCRA
()
bool
AClusterRepresentationActor
::
AttachDCRA
()
{
{
#if PLATFORM_SUPPORTS_CLUSTER
// Add an nDisplay Parent Sync Component. It syncs the parent's transform from master to clients.
// This is required because for collision based movement, it can happen that the physics engine
// for some reason acts different on the nodes, therefore leading to a potential desync when
// e.g. colliding with an object while moving.
if
(
URWTHVRUtilities
::
IsRoomMountedMode
())
if
(
URWTHVRUtilities
::
IsRoomMountedMode
())
{
{
UE_LOGFMT
(
Toolkit
,
Display
,
"{Name}: Trying to attach DCRA"
,
GetName
());
UE_LOGFMT
(
Toolkit
,
Display
,
"{Name}: Trying to attach DCRA"
,
GetName
());
...
@@ -125,7 +124,6 @@ bool AClusterRepresentationActor::AttachDCRA()
...
@@ -125,7 +124,6 @@ bool AClusterRepresentationActor::AttachDCRA()
DCRA
->
SetActorEnableCollision
(
false
);
DCRA
->
SetActorEnableCollision
(
false
);
}
}
#endif
return
true
;
return
true
;
}
}
...
@@ -159,3 +157,5 @@ ADisplayClusterRootActor* AClusterRepresentationActor::SpawnDCRA()
...
@@ -159,3 +157,5 @@ ADisplayClusterRootActor* AClusterRepresentationActor::SpawnDCRA()
}
}
return
RootActor
;
return
RootActor
;
}
}
#endif
This diff is collapsed.
Click to expand it.
Source/RWTHVRToolkit/Public/Pawn/ClusterRepresentationActor.h
+
6
−
1
View file @
59aa41f6
...
@@ -8,7 +8,9 @@
...
@@ -8,7 +8,9 @@
class
ARWTHVRPlayerState
;
class
ARWTHVRPlayerState
;
#if PLATFORM_SUPPORTS_CLUSTER
class
ADisplayClusterRootActor
;
class
ADisplayClusterRootActor
;
#endif
UCLASS
()
UCLASS
()
class
RWTHVRTOOLKIT_API
AClusterRepresentationActor
:
public
AActor
class
RWTHVRTOOLKIT_API
AClusterRepresentationActor
:
public
AActor
...
@@ -24,8 +26,11 @@ public:
...
@@ -24,8 +26,11 @@ public:
void
AttachDCRAIfRequired
(
const
ARWTHVRPlayerState
*
OptionalPlayerState
=
nullptr
);
void
AttachDCRAIfRequired
(
const
ARWTHVRPlayerState
*
OptionalPlayerState
=
nullptr
);
private:
private:
bool
bIsAttached
=
false
;
#if PLATFORM_SUPPORTS_CLUSTER
bool
AttachDCRA
();
bool
AttachDCRA
();
ADisplayClusterRootActor
*
SpawnDCRA
();
ADisplayClusterRootActor
*
SpawnDCRA
();
bool
bIsAttached
=
false
;
#endif
};
};
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