From 2899b9f4a8c7fb646cd25ab1542867dcd974d0e0 Mon Sep 17 00:00:00 2001 From: RAFAL SWIERCZEK Date: Thu, 30 Nov 2023 09:33:28 +0000 Subject: [PATCH 1/4] Deleted Old LOS Test Class --- .../Architecture/Floor_400x400.uasset | 4 +- .../Materials/M_Wood_Pine.uasset | 4 +- .../Materials/M_Wood_Walnut.uasset | 4 +- .../Props/MaterialSphere.uasset | 4 +- .../Recon/VisionLink/VisionLink.cpp | 1 - .../Recon/VisionLink/VisionLink.h | 1 - .../VisionLink/VisionLinkEnemyLOSTest.cpp | 74 ------------------- .../Recon/VisionLink/VisionLinkEnemyLOSTest.h | 30 -------- 8 files changed, 8 insertions(+), 114 deletions(-) delete mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.cpp delete mode 100644 EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.h diff --git a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset index c2a34afc..9fe9e00c 100644 --- a/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset +++ b/EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4c0ecf0ac0702cc2bd355ec050232a61c49e10f102448efbeb735a51824adef6 -size 14948 +oid sha256:1dab05352d920eb93c5a61a681634f187e65971458c68dd559602b2510811889 +size 14831 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset index fb828784..eafee70c 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:196eb4590144ea90058b1a8b48d4662f2ba04302d4184e5e68698a3e715cc50e -size 29377 +oid sha256:b12c6d7285dd95b1c5669e07fc665f8859a17ee78c51f139170726848c06ee67 +size 31142 diff --git a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset index 1d3466c4..2e926194 100644 --- a/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset +++ b/EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da10621d164f621c3c598d9d293d707a2879d7caf8c0525652a06b38323820f0 -size 20139 +oid sha256:8491e0b8978a41999e0f4fc6520cab088fcbe6ddf8b51655f34753aa45234c66 +size 20495 diff --git a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset index 89145d94..56bddfc9 100644 --- a/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset +++ b/EndlessVendetta/Content/StarterContent/Props/MaterialSphere.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b7943b84a70f66da9ce4c738e5748bd6853c3af285ea2f99a76efa584cb31301 -size 47710 +oid sha256:3a8777c01491888bba9f40eda9d2bed76a611f0e80f75917501ce69c1a321342 +size 47333 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp index 1dbe1dd7..890916c0 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp @@ -6,7 +6,6 @@ #include "CollisionDebugDrawingPublic.h" #include "Kismet/KismetMathLibrary.h" #include "Camera/CameraComponent.h" -#include "VisionLinkEnemyLOSTest.h" #include "GameFramework/Character.h" void AVisionLink::BeginPlay() diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.h index 2a3b7789..40d5c103 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.h +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.h @@ -3,7 +3,6 @@ #pragma once #include "CoreMinimal.h" -#include "VisionLinkEnemyLOSTest.h" #include "EndlessVendetta/GadgetSystem/ReconGadget.h" #include "VisionLink.generated.h" diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.cpp deleted file mode 100644 index eb11bf58..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - - -#include "VisionLinkEnemyLOSTest.h" - -#include "Components/BoxComponent.h" -#include "Kismet/KismetMathLibrary.h" - -// Sets default values -AVisionLinkEnemyLOSTest::AVisionLinkEnemyLOSTest() -{ - // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. - PrimaryActorTick.bCanEverTick = true; - -} - -// Called when the game starts or when spawned -void AVisionLinkEnemyLOSTest::BeginPlay() -{ - Super::BeginPlay(); - -} - -// Called every frame -void AVisionLinkEnemyLOSTest::Tick(float DeltaTime) -{ - Super::Tick(DeltaTime); - -} - -void AVisionLinkEnemyLOSTest::TestLOS(TArray EnemiesInLink, AActor* LOSActor) -{ - // Get all overlapping Actors - UBoxComponent* CollisionBox = Cast(GetComponentByClass(UBoxComponent::StaticClass())); - if (!IsValid(CollisionBox)) - { - Destroy(); - return; - } - TArray OverlappingEnemies; - CollisionBox->GetOverlappingActors(OverlappingEnemies); - if (OverlappingEnemies.IsEmpty()) - { - Destroy(); - return; - } - - for (int i = 0; i < OverlappingEnemies.Num(); i++) - { - // Overlapping Enemies Array should only contain enemies which aren't already in the link - if (!OverlappingEnemies[i]->ActorHasTag(FName("Enemy")) || EnemiesInLink.Contains(OverlappingEnemies[i]->GetUniqueID())) - { - UE_LOG(LogTemp, Warning, TEXT("enemy name: %s"), *OverlappingEnemies[i]->GetName()); - OverlappingEnemies.RemoveAt(i); - } - } - if (OverlappingEnemies.IsEmpty()) - { - Destroy(); - return; - } - - /*for (AActor* Enemy : OverlappingEnemies) - { - FRotator LookAtRotation = UKismetMathLibrary::FindLookAtRotation(LOSActor->GetActorLocation(), Enemy->GetActorLocation()); - UE_LOG(LogTemp, Warning, TEXT("Look at Rotation: %f"), LookAtRotation.Yaw); - }*/ - - Destroy(); - - -} - - diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.h b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.h deleted file mode 100644 index add35b97..00000000 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLinkEnemyLOSTest.h +++ /dev/null @@ -1,30 +0,0 @@ -// Fill out your copyright notice in the Description page of Project Settings. - -#pragma once - -#include "CoreMinimal.h" -#include "GameFramework/Actor.h" -#include "VisionLinkEnemyLOSTest.generated.h" - -UCLASS() -class ENDLESSVENDETTA_API AVisionLinkEnemyLOSTest : public AActor -{ - GENERATED_BODY() - - -protected: - // Called when the game starts or when spawned - virtual void BeginPlay() override; - -public: - UPROPERTY(EditDefaultsOnly, Category = "Vision Link") - float SpawnOffset = 0; - - // Sets default values for this actor's properties - AVisionLinkEnemyLOSTest(); - - // Called every frame - virtual void Tick(float DeltaTime) override; - - void TestLOS(TArray EnemiesInLink, AActor* LOS_Actor); -}; From 354b3b2a113fe6b24413e374ca5f21d7b5fbebf0 Mon Sep 17 00:00:00 2001 From: RAFAL SWIERCZEK Date: Thu, 30 Nov 2023 09:45:03 +0000 Subject: [PATCH 2/4] Deleted Text Background Asset --- .../Content/BountySystem/Waypoint/TextBackground.png | 3 --- .../Content/BountySystem/Waypoint/TextBackground.uasset | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png delete mode 100644 EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png deleted file mode 100644 index d5781e4c..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d3cccd91fdbe7e0090f451048771e56d36dbe24c3cb716b63d99261f414f868 -size 2232177 diff --git a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset b/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset deleted file mode 100644 index c80f44a0..00000000 --- a/EndlessVendetta/Content/BountySystem/Waypoint/TextBackground.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c06aa560dd0dffcca87ab60abe3a290e98e28c94ef52e58338c9e985c83d1ac0 -size 1854378 From 331259cc1ba8473165cfec23504cf09e5508c466 Mon Sep 17 00:00:00 2001 From: RAFAL SWIERCZEK Date: Thu, 30 Nov 2023 10:15:38 +0000 Subject: [PATCH 3/4] Bugfix Equipped Guns Block LOS for Vision Link --- EndlessVendetta/Content/Levels/TrainingFacility.umap | 4 ++-- .../GadgetClasses/Recon/VisionLink/VisionLink.cpp | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/EndlessVendetta/Content/Levels/TrainingFacility.umap b/EndlessVendetta/Content/Levels/TrainingFacility.umap index 19053416..174ac378 100644 --- a/EndlessVendetta/Content/Levels/TrainingFacility.umap +++ b/EndlessVendetta/Content/Levels/TrainingFacility.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9085d76489c04f7d273f580154acee8bbe53b285514f36e2770d3be3e9407730 -size 679662 +oid sha256:7711a7f6afcfd75419a73d627b6359ec3fb76c48d9dbb34e50b2a2318ee05b7d +size 679380 diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp index 890916c0..09cbf980 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp @@ -6,6 +6,7 @@ #include "CollisionDebugDrawingPublic.h" #include "Kismet/KismetMathLibrary.h" #include "Camera/CameraComponent.h" +#include "EndlessVendetta/EndlessVendettaCharacter.h" #include "GameFramework/Character.h" void AVisionLink::BeginPlay() @@ -46,9 +47,16 @@ void AVisionLink::SendOutPingPulse() GetWorld()->GetTimerManager().SetTimer(PulseHandle, this, &AVisionLink::SendOutPingPulse, TimeInbetweenPingPulses, false); PlayPingPulseAnim(TimeInbetweenPingPulses); - UCameraComponent* PlayerCamComp = Cast(GetWorld()->GetFirstPlayerController()->GetCharacter()->GetComponentByClass(UCameraComponent::StaticClass())); + ACharacter* PlayersCharacter = GetWorld()->GetFirstPlayerController()->GetCharacter(); + UCameraComponent* PlayerCamComp = Cast(PlayersCharacter->GetComponentByClass(UCameraComponent::StaticClass())); + + // Ignored Actors TArray ActorsToIgnore; - ActorsToIgnore.Add(GetWorld()->GetFirstPlayerController()->GetCharacter()); + AEndlessVendettaCharacter* EV_Character = Cast(PlayersCharacter); + if ( IsValid(EV_Character) && IsValid(EV_Character->PrimaryWeaponActor)) ActorsToIgnore.Add(EV_Character->PrimaryWeaponActor); + if ( IsValid(EV_Character) && IsValid(EV_Character->SecondaryWeaponActor)) ActorsToIgnore.Add(EV_Character->SecondaryWeaponActor); + ActorsToIgnore.Add(PlayersCharacter); + TestLOS(PlayerCamComp->GetComponentTransform(), ActorsToIgnore); } From 0c8dbbf03bb43decb1a27d0f98c824f5f09b6e33 Mon Sep 17 00:00:00 2001 From: RAFAL SWIERCZEK Date: Thu, 30 Nov 2023 10:20:23 +0000 Subject: [PATCH 4/4] Bugfix VisionLink Marking Dead Enemies --- .../GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp index 09cbf980..eca0e33f 100644 --- a/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp +++ b/EndlessVendetta/Source/EndlessVendetta/GadgetSystem/GadgetClasses/Recon/VisionLink/VisionLink.cpp @@ -82,7 +82,7 @@ void AVisionLink::TestLOS(FTransform StartingPos, TArray &ActorsToIgnor if (!GetWorld()->LineTraceSingleByChannel(outHit, StartingPos.GetLocation(), LT_EndPoint, ECC_Camera, QueryParams)) continue; AActor* HitActor = outHit.GetActor(); - if (!HitActor->ActorHasTag(FName("Enemy"))) continue; + if (!HitActor->ActorHasTag(FName("Enemy")) || HitActor->ActorHasTag("Dead")) continue; //DrawDebugLine(GetWorld(), outHit.TraceStart, outHit.ImpactPoint, FColor::Blue, false, 3, 0, 3); ActorsToIgnore.Add(HitActor);