Philip/EndlessVendetta
Philip/EndlessVendetta
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Fixed Multiple Main Waypoints Becoming Focused When Looking at Just One

Browse Source
This commit is contained in:
Rafal Swierczek 2023-11-26 23:59:53 +00:00
parent c51f2ab7b6
commit 797653132e
7 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EndlessVendetta/Content/BountySystem/Waypoint/BP_Waypoint.uasset (Stored with Git LFS)
View File

Binary file not shown.

4
EndlessVendetta/Content/Levels/TrainingFacility.umap
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d3943e1a064276d17b897a7a10a3c42a35c75d6c02117bd1ea962544f3576a9b oid sha256:68499c0acedf4bd43fa13b5244a3900ad9850ff62e15ac85b1e337859200d06d
size 654898 size 654847

BIN
EndlessVendetta/Content/StarterContent/Particles/P_Ambient_Dust.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset (Stored with Git LFS)
View File

Binary file not shown.

1
EndlessVendetta/Source/EndlessVendetta/BountySystem/CheckpointClass.cpp
View File

@ -46,6 +46,7 @@ void ACheckpointClass::Tick(float DeltaTime)
void ACheckpointClass::Destroyed() void ACheckpointClass::Destroyed()
{ {
if (WaypointActor) WaypointActor->Destroy(); if (WaypointActor) WaypointActor->Destroy();
Super::Destroyed();
} }

11
EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.cpp
View File

@ -22,7 +22,7 @@ void AWaypointActor::SetupWaypoint_Implementation(UTexture2D* Icon, const FStrin
ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude); ScalingY_Intercept = ScaleAtMaxDist - (MaxDist * ScalingMagnitude);
MiniWaypoint = CreateWidget<UMiniWaypoint>(GetWorld(), MiniWaypointClass); MiniWaypoint = CreateWidget<UMiniWaypoint>(GetWorld(), MiniWaypointClass);
MiniWaypoint->AddToViewport(1); MiniWaypoint->AddToViewport(0);
MiniWaypoint->WorldLoc = this->GetActorLocation(); MiniWaypoint->WorldLoc = this->GetActorLocation();
MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController(); MiniWaypoint->PlayerController = GetWorld()->GetFirstPlayerController();
MiniWaypoint->SetIcon(Icon); MiniWaypoint->SetIcon(Icon);
@ -51,7 +51,7 @@ bool AWaypointActor::SightCheck()
ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2); ObjectQueryParams.AddObjectTypesToQuery(ECollisionChannel::ECC_GameTraceChannel2);
FVector LT_Start = PlayersCam->GetComponentLocation(); FVector LT_Start = PlayersCam->GetComponentLocation();
FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance); FVector LT_End = LT_Start + (PlayersCam->GetForwardVector() * WaypointFocusDistance);
if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams)) return true; if (GetWorld()->LineTraceSingleByObjectType(OutHit, LT_Start, LT_End, ObjectQueryParams) && OutHit.GetActor()->GetUniqueID() == this->GetUniqueID()) return true;
return false; return false;
} }
@ -72,3 +72,10 @@ void AWaypointActor::UpdateScaleAndRotation()
SetActorScale3D(FVector(1.f, S, S)); SetActorScale3D(FVector(1.f, S, S));
} }
void AWaypointActor::Destroyed()
{
if (IsValid(MiniWaypoint)) MiniWaypoint->RemoveFromParent();
Super::Destroyed();
}

2
EndlessVendetta/Source/EndlessVendetta/BountySystem/WaypointActor.h
View File

@ -47,6 +47,8 @@ protected:
UFUNCTION(BlueprintImplementableEvent) UFUNCTION(BlueprintImplementableEvent)
void UpdateVisibility(bool IsVisible); void UpdateVisibility(bool IsVisible);
void Destroyed() override;
public: public:
// Sets default values for this actor's properties // Sets default values for this actor's properties
AWaypointActor(); AWaypointActor();