Skip to content
Snippets Groups Projects

Fix/cluster event wrapper

Merged Jonathan Ehret requested to merge fix/cluster-event-wrapper into dev/5.3
1 file
+ 1
11
Compare changes
  • Side-by-side
  • Inline
@@ -25,13 +25,9 @@ public:
void Attach(ObjectType* NewObject)
{
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Attach()."))
checkf(Object == nullptr, TEXT("The event is already attached."));
Object = NewObject;
ObjectName = Object->GetFullName();
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Object name: %s and method name %s."), *ObjectName, *MethodName)
EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode();
if (OperationMode == EDisplayClusterOperationMode::Cluster)
@@ -56,7 +52,6 @@ public:
if (EventObjectName != ObjectName)
{
// Event does not belong to this object.
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Event does not belong to this object %s vs %s (this object)."), *EventObjectName, *ObjectName)
return;
}
@@ -66,7 +61,6 @@ public:
if (EventMethodName != MethodName)
{
// This event does not belong to this method.
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] This event does not belong to this method. %s vs %s (this object)."), *EventMethodName, *MethodName)
return;
}
@@ -77,8 +71,6 @@ public:
// This call will deserialze the values and fill all values in the tuple appropriately.
FillArgumentTuple<0>(&MemoryReader, &ArgumentTuple);
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Cluster event was received, call function."))
ArgumentTuple.ApplyBefore([this](const ArgTypes&... Arguments)
{ (Object->*MemberFunction)(Forward<const ArgTypes&>(Arguments)...); });
@@ -109,7 +101,7 @@ public:
EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode();
if (OperationMode != EDisplayClusterOperationMode::Cluster)
{
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Cluster event was bypassed and function directly called"))
//Cluster event can be bypassed and function directly called
(Object->*MemberFunction)(Forward<ArgTypes>(Arguments)...);
}
else
@@ -127,8 +119,6 @@ public:
SerializeParameters(&MemoryWriter, Forward<ArgTypes>(Arguments)...);
ClusterManager->EmitClusterEventBinary(ClusterEvent, true);
UE_LOG(LogTemp, Warning, TEXT("[DisplayClusterEventWrapper] Cluster event was emitted"))
}
}
Loading