Skip to content
Snippets Groups Projects

Get changes and fixes from 4.26 into 5 as well

4 files
+ 96
22
Compare changes
  • Side-by-side
  • Inline

Files

@@ -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);
}
}
@@ -138,7 +138,7 @@ void UBasicVRInteractionComponent::TickComponent(float DeltaTime, ELevelTick Tic
@@ -138,7 +138,7 @@ void UBasicVRInteractionComponent::TickComponent(float DeltaTime, ELevelTick Tic
const FTwoVectors StartEnd = GetHandRay(MaxClickDistance);
const FTwoVectors StartEnd = GetHandRay(MaxClickDistance);
TOptional<FHitResult> Hit = RaytraceForFirstHit(StartEnd);
TOptional<FHitResult> Hit = RaytraceForFirstHit(StartEnd);
if (!Hit.IsSet())
if (!Hit.IsSet() || !Hit->GetActor())
{
{
if(InteractionRayVisibility==EInteractionRayVisibility::VisibleOnHoverOnly)
if(InteractionRayVisibility==EInteractionRayVisibility::VisibleOnHoverOnly)
{
{
Loading