Neighbors function draft; refactoring

This commit is contained in:
Maximilian Fajnberg 2022-01-13 16:34:06 +01:00
parent b5c9c661fe
commit 219b99c8d7
6 changed files with 34 additions and 14 deletions

View File

@ -20,7 +20,7 @@ AAdventureCameraPawn::AAdventureCameraPawn()
ESASize = .01; ESASize = .01;
BaseScrollSpeed = 16; BaseScrollSpeed = 16;
ScrollAccelleration = BaseScrollSpeed * 2.2; ScrollAccelleration = BaseScrollSpeed * 2.4;
ESAMaxBoundSlope = 1 / (1 - (1-ESASize)); ESAMaxBoundSlope = 1 / (1 - (1-ESASize));
ESAMaxBoundIntercept = 1 - ESAMaxBoundSlope; ESAMaxBoundIntercept = 1 - ESAMaxBoundSlope;

View File

@ -34,10 +34,9 @@ void AAdventureCharacter::SetupPlayerInputComponent(UInputComponent* PlayerInput
} }
void AAdventureCharacter::AStarFindPath(AHexTile*) void AAdventureCharacter::AStarFindPath(AHexTile* Goal)
{ {
std::priority_queue<int32> Frontier; std::priority_queue<int32> Frontier;
TMap<AHexTile*, AHexTile*> CameFrom; TMap<AHexTile*, AHexTile*> CameFrom;
TMap<AHexTile*, int32> CostSoFar; TMap<AHexTile*, int32> CostSoFar;
} }

View File

@ -92,3 +92,29 @@ AHexTile* AAdventureMap::RandomHex()
} }
return Grid[RandHex]; return Grid[RandHex];
} }
TArray<AHexTile*> AAdventureMap::Neighbors(AHexTile* OfHex)
{
TArray<AHexTile*> Neighbors;
int32 Index;
Index = GridIndex(OfHex->Q + 1 , OfHex->R + 0 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
Index = GridIndex(OfHex->Q + 1 , OfHex->R - 1 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
Index = GridIndex(OfHex->Q + 0 , OfHex->R - 1 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
Index = GridIndex(OfHex->Q - 1 , OfHex->R + 0 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
Index = GridIndex(OfHex->Q - 1 , OfHex->R + 1 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
Index = GridIndex(OfHex->Q + 0 , OfHex->R + 1 );
if (Index < Grid.Num() && Index >= 0) { Neighbors.Add(Grid[Index]); }
return Neighbors; // currently wrapping from corner to corner --> rectify this with a manhattan distance check
}

View File

@ -38,6 +38,8 @@ public:
int32 GridIndex(int32 q, int32 r); int32 GridIndex(int32 q, int32 r);
UFUNCTION(BlueprintCallable) UFUNCTION(BlueprintCallable)
AHexTile* RandomHex(); AHexTile* RandomHex();
UFUNCTION(BlueprintCallable)
TArray<AHexTile*> Neighbors(AHexTile* OfHexTile);
// Player spawn section // Player spawn section
UPROPERTY(VisibleAnywhere, BlueprintReadWrite) UPROPERTY(VisibleAnywhere, BlueprintReadWrite)

View File

@ -3,7 +3,7 @@
#include "HexTile.h" #include "HexTile.h"
#include "AdventurePlayerController.h" #include "AdventurePlayerController.h"
#include "AdventureMap.h"
#include "Kismet/KismetMathLibrary.h" #include "Kismet/KismetMathLibrary.h"
// Sets default values // Sets default values
@ -39,9 +39,3 @@ void AHexTile::FillCornersArray()
Corners.Emplace(Corner(i + 1)); Corners.Emplace(Corner(i + 1));
} }
} }
TArray<AHexTile*> AHexTile::Neighbors(AHexTile* OfHexTile)
{
return TArray<AHexTile*>();
}

View File

@ -9,7 +9,7 @@
class USceneComponent; class USceneComponent;
class UStaticMeshComponent; class UStaticMeshComponent;
class AAdventureMap;
class AAdventurePlayerController; class AAdventurePlayerController;
UCLASS() UCLASS()
@ -40,9 +40,8 @@ public:
UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Runtime") UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = "Runtime")
int32 Index; int32 Index;
UFUNCTION(BlueprintCallable) UPROPERTY(BlueprintReadWrite, Category = "Runtime")
TArray<AHexTile*> Neighbors(AHexTile* OfHexTile); AAdventureMap* MapRef;
protected: protected:
// Called when the game starts or when spawned // Called when the game starts or when spawned
virtual void BeginPlay() override; virtual void BeginPlay() override;