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
GitLab 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
9de243b2
Commit
9de243b2
authored
3 years ago
by
Römer
Browse files
Options
Downloads
Patches
Plain Diff
Check if actor is null before checking interfaces
parent
6edddcbc
No related branches found
No related tags found
3 merge requests
!22
Get changes and fixes from 4.26 into 5 as well
,
!11
add HitActor Interaction bug fix into 4.27
,
!10
Fixed Nullpointer Exception when Interacting with BrushActor
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Source/RWTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp
+2
-2
2 additions, 2 deletions
...WTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp
with
2 additions
and
2 deletions
Source/RWTHVRToolkit/Private/Pawn/BasicVRInteractionComponent.cpp
+
2
−
2
View file @
9de243b2
...
@@ -63,7 +63,7 @@ void UBasicVRInteractionComponent::BeginInteraction()
...
@@ -63,7 +63,7 @@ void UBasicVRInteractionComponent::BeginInteraction()
PressPointerKey
(
EKeys
::
LeftMouseButton
);
PressPointerKey
(
EKeys
::
LeftMouseButton
);
if
(
HitActor
->
Implements
<
UGrabable
>
()
&&
Hit
->
Distance
<
MaxGrabDistance
)
if
(
HitActor
&&
HitActor
->
Implements
<
UGrabable
>
()
&&
Hit
->
Distance
<
MaxGrabDistance
)
{
{
// call grabable actors function so he reacts to our grab
// call grabable actors function so he reacts to our grab
IGrabable
::
Execute_OnBeginGrab
(
HitActor
);
IGrabable
::
Execute_OnBeginGrab
(
HitActor
);
...
@@ -76,7 +76,7 @@ void UBasicVRInteractionComponent::BeginInteraction()
...
@@ -76,7 +76,7 @@ void UBasicVRInteractionComponent::BeginInteraction()
// we save the grabbedActor in a general form to access all of AActors functions easily later
// we save the grabbedActor in a general form to access all of AActors functions easily later
GrabbedActor
=
HitActor
;
GrabbedActor
=
HitActor
;
}
}
else
if
(
HitActor
->
Implements
<
UClickable
>
()
&&
Hit
->
Distance
<
MaxClickDistance
)
else
if
(
HitActor
&&
HitActor
->
Implements
<
UClickable
>
()
&&
Hit
->
Distance
<
MaxClickDistance
)
{
{
IClickable
::
Execute_OnClick
(
HitActor
,
Hit
->
Location
);
IClickable
::
Execute_OnClick
(
HitActor
,
Hit
->
Location
);
}
}
...
...
This diff is collapsed.
Click to expand it.
David Gilbert
@david.gilbert
mentioned in commit
0b8b13b6
·
2 years ago
mentioned in commit
0b8b13b6
mentioned in commit 0b8b13b60a69676ef22fd137c3ff456ccfaf0932
Toggle commit list
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