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
64ed371a
Commit
64ed371a
authored
11 months ago
by
Jonathan Ehret
Browse files
Options
Downloads
Patches
Plain Diff
copy over fix from RWTH VR Cluster Plugin
parent
0a5e566b
Branches
Branches containing commit
Tags
Tags containing commit
4 merge requests
!97
update refactor branch with latest dev changes
,
!96
style(interaction): fixes clang-formatting error
,
!95
Propagate 5.3 hotfixes into dev branches
,
!92
copy over fix from RWTH VR Cluster Plugin
Pipeline
#427742
failed
11 months ago
Stage: analyze
Stage: generate
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
+7
-6
7 additions, 6 deletions
.../RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
with
7 additions
and
6 deletions
Source/RWTHVRCluster/Public/Events/DisplayClusterEventWrapper.h
+
7
−
6
View file @
64ed371a
...
...
@@ -26,7 +26,7 @@ public:
{
checkf
(
Object
==
nullptr
,
TEXT
(
"The event is already attached."
));
Object
=
NewObject
;
Object
Id
=
Object
->
Get
UniqueID
();
Object
Name
=
Object
->
Get
FullName
();
EDisplayClusterOperationMode
OperationMode
=
IDisplayCluster
::
Get
().
GetOperationMode
();
if
(
OperationMode
==
EDisplayClusterOperationMode
::
Cluster
)
...
...
@@ -45,10 +45,10 @@ public:
FMemoryReader
MemoryReader
(
Event
.
EventData
);
uint32
EventObject
Id
;
FString
EventObject
Name
;
// This reads the value!
MemoryReader
<<
EventObject
Id
;
if
(
EventObject
Id
!=
Object
Id
)
MemoryReader
<<
EventObject
Name
;
if
(
EventObject
Name
!=
Object
Name
)
{
// Event does not belong to this object.
return
;
...
...
@@ -100,6 +100,7 @@ public:
EDisplayClusterOperationMode
OperationMode
=
IDisplayCluster
::
Get
().
GetOperationMode
();
if
(
OperationMode
!=
EDisplayClusterOperationMode
::
Cluster
)
{
//Cluster event can be bypassed and function directly called
(
Object
->*
MemberFunction
)(
Forward
<
ArgTypes
>
(
Arguments
)...);
}
else
...
...
@@ -112,7 +113,7 @@ public:
ClusterEvent
.
bShouldDiscardOnRepeat
=
false
;
FMemoryWriter
MemoryWriter
(
ClusterEvent
.
EventData
);
MemoryWriter
<<
Object
Id
;
MemoryWriter
<<
const_cast
<
FString
&>
(
Object
Name
)
;
MemoryWriter
<<
const_cast
<
FString
&>
(
MethodName
);
SerializeParameters
(
&
MemoryWriter
,
Forward
<
ArgTypes
>
(
Arguments
)...);
...
...
@@ -122,7 +123,7 @@ public:
private
:
const
FString
MethodName
;
uint32
Object
Id
;
FString
Object
Name
;
ObjectType
*
Object
=
nullptr
;
FOnClusterEventBinaryListener
ClusterEventListenerDelegate
;
};
...
...
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