Skip to content
Snippets Groups Projects
Commit 64ed371a authored by Jonathan Ehret's avatar Jonathan Ehret
Browse files

copy over fix from RWTH VR Cluster Plugin

parent 0a5e566b
No related branches found
No related tags found
4 merge requests!97update refactor branch with latest dev changes,!96style(interaction): fixes clang-formatting error,!95Propagate 5.3 hotfixes into dev branches,!92copy over fix from RWTH VR Cluster Plugin
Pipeline #427742 failed
...@@ -26,7 +26,7 @@ public: ...@@ -26,7 +26,7 @@ public:
{ {
checkf(Object == nullptr, TEXT("The event is already attached.")); checkf(Object == nullptr, TEXT("The event is already attached."));
Object = NewObject; Object = NewObject;
ObjectId = Object->GetUniqueID(); ObjectName = Object->GetFullName();
EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode(); EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode();
if (OperationMode == EDisplayClusterOperationMode::Cluster) if (OperationMode == EDisplayClusterOperationMode::Cluster)
...@@ -45,10 +45,10 @@ public: ...@@ -45,10 +45,10 @@ public:
FMemoryReader MemoryReader(Event.EventData); FMemoryReader MemoryReader(Event.EventData);
uint32 EventObjectId; FString EventObjectName;
// This reads the value! // This reads the value!
MemoryReader << EventObjectId; MemoryReader << EventObjectName;
if (EventObjectId != ObjectId) if (EventObjectName != ObjectName)
{ {
// Event does not belong to this object. // Event does not belong to this object.
return; return;
...@@ -100,6 +100,7 @@ public: ...@@ -100,6 +100,7 @@ public:
EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode(); EDisplayClusterOperationMode OperationMode = IDisplayCluster::Get().GetOperationMode();
if (OperationMode != EDisplayClusterOperationMode::Cluster) if (OperationMode != EDisplayClusterOperationMode::Cluster)
{ {
//Cluster event can be bypassed and function directly called
(Object->*MemberFunction)(Forward<ArgTypes>(Arguments)...); (Object->*MemberFunction)(Forward<ArgTypes>(Arguments)...);
} }
else else
...@@ -112,7 +113,7 @@ public: ...@@ -112,7 +113,7 @@ public:
ClusterEvent.bShouldDiscardOnRepeat = false; ClusterEvent.bShouldDiscardOnRepeat = false;
FMemoryWriter MemoryWriter(ClusterEvent.EventData); FMemoryWriter MemoryWriter(ClusterEvent.EventData);
MemoryWriter << ObjectId; MemoryWriter << const_cast<FString&>(ObjectName);
MemoryWriter << const_cast<FString&>(MethodName); MemoryWriter << const_cast<FString&>(MethodName);
SerializeParameters(&MemoryWriter, Forward<ArgTypes>(Arguments)...); SerializeParameters(&MemoryWriter, Forward<ArgTypes>(Arguments)...);
...@@ -122,7 +123,7 @@ public: ...@@ -122,7 +123,7 @@ public:
private: private:
const FString MethodName; const FString MethodName;
uint32 ObjectId; FString ObjectName;
ObjectType* Object = nullptr; ObjectType* Object = nullptr;
FOnClusterEventBinaryListener ClusterEventListenerDelegate; FOnClusterEventBinaryListener ClusterEventListenerDelegate;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment