From 18dcb53b2634ffcb35677d2d90ff1de349681e3d Mon Sep 17 00:00:00 2001
From: David Gilbert <gilbert@vr.rwth-aachen.de>
Date: Mon, 22 Jan 2024 16:12:32 +0100
Subject: [PATCH] refactor(Pawn): Removes leftover input from Cluster module
and removes SyncComponent for now until a better solution is found.
---
Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp | 4 +++-
Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp b/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp
index 6e88a3cb..5a84da66 100644
--- a/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp
+++ b/Source/RWTHVRToolkit/Private/Pawn/RWTHVRPawn.cpp
@@ -36,7 +36,8 @@ ARWTHVRPawn::ARWTHVRPawn(const FObjectInitializer& ObjectInitializer) : Super(Ob
LeftHand = CreateDefaultSubobject<UReplicatedMotionControllerComponent>(TEXT("Left Hand MCC"));
LeftHand->SetupAttachment(RootComponent);
-
+
+#if 0
// 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
@@ -44,6 +45,7 @@ ARWTHVRPawn::ARWTHVRPawn(const FObjectInitializer& ObjectInitializer) : Super(Ob
SyncComponent =
CreateDefaultSubobject<UDisplayClusterSceneComponentSyncParent>(TEXT("Parent Display Cluster Sync Component"));
SyncComponent->SetupAttachment(RootComponent);
+#endif
}
void ARWTHVRPawn::Tick(float DeltaSeconds)
diff --git a/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h b/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h
index ca774d37..b171d3f1 100644
--- a/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h
+++ b/Source/RWTHVRToolkit/Public/Pawn/RWTHVRPawn.h
@@ -6,7 +6,9 @@
#include "LiveLinkRole.h"
#include "Pawn/Navigation/CollisionHandlingMovement.h"
+#if 0
#include "Components/DisplayClusterSceneComponentSyncParent.h"
+#endif
#include "RWTHVRPawn.generated.h"
@@ -55,7 +57,7 @@ public:
UCameraComponent* HeadCameraComponent;
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Pawn|Camera")
- UDisplayClusterSceneComponentSyncParent* SyncComponent;
+ USceneComponent* SyncComponent;
// LiveLink functionality
--
GitLab