From 942e565d1847b0c1eaa44304567da2314e12d387 Mon Sep 17 00:00:00 2001 From: neural-operator <129229063+neural-operator@users.noreply.github.com> Date: Wed, 29 Mar 2023 02:05:10 +0300 Subject: [PATCH] UE5 compatibility (#1) * move headers to comply with UE5 requirements * removed precompiled header --------- Co-authored-by: neural-operator --- Source/Navgrid/NavGrid.Build.cs | 1 - Source/Navgrid/Private/ExampleGridPawn.cpp | 3 ++- .../Navgrid/Private/GridMovementComponent.cpp | 6 +++++- Source/Navgrid/Private/GridPawn.cpp | 3 ++- Source/Navgrid/Private/NavGrid.cpp | 15 ++++++++++++--- Source/Navgrid/Private/NavGridGameMode.cpp | 3 ++- Source/Navgrid/Private/NavGridGameState.cpp | 2 +- Source/Navgrid/Private/NavGridPC.cpp | 2 +- Source/Navgrid/Private/NavGridPlugin.cpp | 1 - Source/Navgrid/Private/NavGridPlugin.h | 2 +- Source/Navgrid/Private/NavGridPrivatePCH.h | 17 ----------------- Source/Navgrid/Private/NavLadderActor.cpp | 2 +- Source/Navgrid/Private/NavLadderComponent.cpp | 2 +- Source/Navgrid/Private/NavTileActor.cpp | 1 - Source/Navgrid/Private/NavTileComponent.cpp | 2 +- Source/Navgrid/Private/TurnComponent.cpp | 2 +- Source/Navgrid/Private/TurnManager.cpp | 2 +- 17 files changed, 31 insertions(+), 35 deletions(-) delete mode 100644 Source/Navgrid/Private/NavGridPrivatePCH.h diff --git a/Source/Navgrid/NavGrid.Build.cs b/Source/Navgrid/NavGrid.Build.cs index 6af13c5..ff839bb 100755 --- a/Source/Navgrid/NavGrid.Build.cs +++ b/Source/Navgrid/NavGrid.Build.cs @@ -5,7 +5,6 @@ public class NavGrid : ModuleRules { public NavGrid(ReadOnlyTargetRules TargetRules) : base(TargetRules) { PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "AIModule" }); - PrivatePCHHeaderFile = "Private/NavGridPrivatePCH.h"; if (TargetRules.bBuildEditor) { diff --git a/Source/Navgrid/Private/ExampleGridPawn.cpp b/Source/Navgrid/Private/ExampleGridPawn.cpp index bd5b41f..ee1a487 100755 --- a/Source/Navgrid/Private/ExampleGridPawn.cpp +++ b/Source/Navgrid/Private/ExampleGridPawn.cpp @@ -1,10 +1,11 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" #include "ExampleGridPawn.h" +#include "Engine.h" #include "Components/StaticMeshComponent.h" #include "Components/ArrowComponent.h" +#include "Components/CapsuleComponent.h" AExampleGridPawn::AExampleGridPawn() :Super() diff --git a/Source/Navgrid/Private/GridMovementComponent.cpp b/Source/Navgrid/Private/GridMovementComponent.cpp index 1d220b2..a53eb4e 100755 --- a/Source/Navgrid/Private/GridMovementComponent.cpp +++ b/Source/Navgrid/Private/GridMovementComponent.cpp @@ -1,7 +1,11 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "GridMovementComponent.h" +#include "NavGrid.h" +#include "NavGridGameState.h" +#include "NavLadderComponent.h" +#include "TurnComponent.h" #include "Components/SplineComponent.h" #include "Components/SplineMeshComponent.h" #include "Animation/AnimInstance.h" diff --git a/Source/Navgrid/Private/GridPawn.cpp b/Source/Navgrid/Private/GridPawn.cpp index e7762a8..502ac97 100755 --- a/Source/Navgrid/Private/GridPawn.cpp +++ b/Source/Navgrid/Private/GridPawn.cpp @@ -1,6 +1,7 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "GridPawn.h" + #if WITH_EDITORONLY_DATA #include "Editor.h" #endif diff --git a/Source/Navgrid/Private/NavGrid.cpp b/Source/Navgrid/Private/NavGrid.cpp index e82bdf3..512bb7f 100755 --- a/Source/Navgrid/Private/NavGrid.cpp +++ b/Source/Navgrid/Private/NavGrid.cpp @@ -1,6 +1,7 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavGrid.h" + #include "AssetRegistryModule.h" #include @@ -302,9 +303,17 @@ bool ANavGrid::TraceTileLocation(const FVector & TraceStart, const FVector & Tra GetWorld()->LineTraceSingleByChannel(HitResult, TraceStart, TraceEnd, ECollisionChannel::ECC_Pawn, CQP); bool bHasDisableTileTag = false; - if (HitResult.Actor.IsValid()) + + AActor* HitActor = nullptr; + + if (HitResult.IsValidBlockingHit()) + { + HitActor = HitResult.GetActor(); + } + + if (HitActor) { - bHasDisableTileTag = HitResult.Actor->ActorHasTag(DisableVirtualTilesTag); + bHasDisableTileTag = HitActor->ActorHasTag(DisableVirtualTilesTag); } OutTilePos = HitResult.ImpactPoint; diff --git a/Source/Navgrid/Private/NavGridGameMode.cpp b/Source/Navgrid/Private/NavGridGameMode.cpp index 190a3bb..aab48de 100644 --- a/Source/Navgrid/Private/NavGridGameMode.cpp +++ b/Source/Navgrid/Private/NavGridGameMode.cpp @@ -1,6 +1,7 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavGridGameMode.h" +#include "NavGridPC.h" ANavGridGameMode::ANavGridGameMode() :Super() diff --git a/Source/Navgrid/Private/NavGridGameState.cpp b/Source/Navgrid/Private/NavGridGameState.cpp index a8e4986..ed98ee1 100644 --- a/Source/Navgrid/Private/NavGridGameState.cpp +++ b/Source/Navgrid/Private/NavGridGameState.cpp @@ -1,6 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavGridGameState.h" ANavGrid* ANavGridGameState::GetNavGrid() { diff --git a/Source/Navgrid/Private/NavGridPC.cpp b/Source/Navgrid/Private/NavGridPC.cpp index d47142f..39ef3c7 100644 --- a/Source/Navgrid/Private/NavGridPC.cpp +++ b/Source/Navgrid/Private/NavGridPC.cpp @@ -1,6 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavGridPC.h" ANavGridPC::ANavGridPC(const FObjectInitializer& ObjectInitializer) :Super(ObjectInitializer) diff --git a/Source/Navgrid/Private/NavGridPlugin.cpp b/Source/Navgrid/Private/NavGridPlugin.cpp index 6d2c124..8d748b6 100644 --- a/Source/Navgrid/Private/NavGridPlugin.cpp +++ b/Source/Navgrid/Private/NavGridPlugin.cpp @@ -1,4 +1,3 @@ -#include "NavGridPrivatePCH.h" #include "NavGridPlugin.h" diff --git a/Source/Navgrid/Private/NavGridPlugin.h b/Source/Navgrid/Private/NavGridPlugin.h index be724cc..130145d 100644 --- a/Source/Navgrid/Private/NavGridPlugin.h +++ b/Source/Navgrid/Private/NavGridPlugin.h @@ -1,6 +1,6 @@ #pragma once -#include "ModuleManager.h" +#include "Modules/ModuleManager.h" class NavGridPluginImpl : public IModuleInterface { diff --git a/Source/Navgrid/Private/NavGridPrivatePCH.h b/Source/Navgrid/Private/NavGridPrivatePCH.h deleted file mode 100644 index 6e963dc..0000000 --- a/Source/Navgrid/Private/NavGridPrivatePCH.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "Engine.h" -#include "NavGrid.h" - -#include "../Classes/NavGrid.h" -#include "../Classes/NavTileComponent.h" -#include "../Classes/NavLadderComponent.h" -#include "../Classes/GridPawn.h" -#include "../Classes/GridMovementComponent.h" -#include "../Classes/TurnComponent.h" -#include "../Classes/TurnManager.h" -#include "../Classes/NavTileActor.h" -#include "../Classes/NavLadderActor.h" -#include "../Classes/NavGridGameMode.h" -#include "../Classes/NavGridGameState.h" -#include "../Classes/NavGridPC.h" diff --git a/Source/Navgrid/Private/NavLadderActor.cpp b/Source/Navgrid/Private/NavLadderActor.cpp index f77cc87..91d4613 100644 --- a/Source/Navgrid/Private/NavLadderActor.cpp +++ b/Source/Navgrid/Private/NavLadderActor.cpp @@ -1,6 +1,6 @@ -#include "NavGridPrivatePCH.h" #include "NavLadderActor.h" + ANavLadderActor::ANavLadderActor(const FObjectInitializer &ObjectInitializer) : Super(ObjectInitializer) { diff --git a/Source/Navgrid/Private/NavLadderComponent.cpp b/Source/Navgrid/Private/NavLadderComponent.cpp index e5c3db1..477866d 100644 --- a/Source/Navgrid/Private/NavLadderComponent.cpp +++ b/Source/Navgrid/Private/NavLadderComponent.cpp @@ -1,6 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavLadderComponent.h" UNavLadderComponent::UNavLadderComponent() :Super() diff --git a/Source/Navgrid/Private/NavTileActor.cpp b/Source/Navgrid/Private/NavTileActor.cpp index 8cdbf97..59337fb 100644 --- a/Source/Navgrid/Private/NavTileActor.cpp +++ b/Source/Navgrid/Private/NavTileActor.cpp @@ -1,4 +1,3 @@ -#include "NavGridPrivatePCH.h" #include "NavTileActor.h" ANavTileActor::ANavTileActor(const FObjectInitializer &ObjectInitializer) diff --git a/Source/Navgrid/Private/NavTileComponent.cpp b/Source/Navgrid/Private/NavTileComponent.cpp index 61bceac..55527db 100644 --- a/Source/Navgrid/Private/NavTileComponent.cpp +++ b/Source/Navgrid/Private/NavTileComponent.cpp @@ -1,6 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "NavTileComponent.h" #include #include "Components/CapsuleComponent.h" #include "DrawDebugHelpers.h" diff --git a/Source/Navgrid/Private/TurnComponent.cpp b/Source/Navgrid/Private/TurnComponent.cpp index 43d9284..37904f1 100755 --- a/Source/Navgrid/Private/TurnComponent.cpp +++ b/Source/Navgrid/Private/TurnComponent.cpp @@ -1,6 +1,6 @@ // Fill out your copyright notice in the Description page of Project Settings. -#include "NavGridPrivatePCH.h" +#include "TurnComponent.H" UTurnComponent::UTurnComponent() :Super(), diff --git a/Source/Navgrid/Private/TurnManager.cpp b/Source/Navgrid/Private/TurnManager.cpp index c907a54..ab110be 100755 --- a/Source/Navgrid/Private/TurnManager.cpp +++ b/Source/Navgrid/Private/TurnManager.cpp @@ -1,4 +1,4 @@ -#include "NavGridPrivatePCH.h" +#include "TurnManager.h" ATurnManager::ATurnManager() : MinNumberOfTeams(1),