Maximilian/unreal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

propagated the temporary fix for Neighbors up to A*

Browse Source
This commit is contained in:
Maximilian Fajnberg
2022-01-18 20:19:30 +01:00
parent 239054df49
commit 74eab48a6e
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
AdventureMap.cpp
View File

@@ -117,6 +117,7 @@ TArray<AHexTile*> AAdventureMap::AStar(AHexTile* Start, AHexTile* Goal)
// expand frontier & adjust path data // expand frontier & adjust path data
for (AHexTile* Neighbor : Neighbors(Candidate)) { for (AHexTile* Neighbor : Neighbors(Candidate)) {
if (Neighbor->Distance(Candidate) > 1) { continue; }
if (Processed.Contains(Neighbor)) { continue; } if (Processed.Contains(Neighbor)) { continue; }
bool bInToExamine = ToExamine.Contains(Neighbor); bool bInToExamine = ToExamine.Contains(Neighbor);
@@ -144,14 +145,8 @@ TArray<AHexTile*> AAdventureMap::LinkPath(AHexTile* Start, AHexTile* Goal)
while (iPathNode != Start) { while (iPathNode != Start) {
Path.Emplace(iPathNode); Path.Emplace(iPathNode);
if (iPathNode->Distance(iPathNode->CameFrom) > 1) {
bChainBroken = true;
UE_LOG(LogTemp, Warning, TEXT("Chain is broken in LinkPath function..."));
}
iPathNode = iPathNode->CameFrom; iPathNode = iPathNode->CameFrom;
} }
Algo::Reverse(Path);
return Path; return Path;
} }

3
AdventureMap.h
View File

@@ -47,9 +47,6 @@ public:
UFUNCTION(BlueprintCallable, Category = "Runtime") UFUNCTION(BlueprintCallable, Category = "Runtime")
TArray<AHexTile*> LinkPath(AHexTile* Start, AHexTile* Goal); TArray<AHexTile*> LinkPath(AHexTile* Start, AHexTile* Goal);
UPROPERTY(BlueprintReadOnly, Category = "debug")
bool bChainBroken;
// Player spawn section // Player spawn section
UPROPERTY(VisibleAnywhere, BlueprintReadWrite) UPROPERTY(VisibleAnywhere, BlueprintReadWrite)