From 27f50cc4abec876220579d89c7f4a21c12b1c751 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 14 Apr 2024 05:05:51 +0300 Subject: [PATCH] pathfinder will create path to closest node to target if no direct path is found --- src/astarnavigator/TileNavigator.php | 21 +++++++++++++++++++++ src/entity/ai/path/PathFollower.php | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/astarnavigator/TileNavigator.php b/src/astarnavigator/TileNavigator.php index ac0792f1..77f5f398 100644 --- a/src/astarnavigator/TileNavigator.php +++ b/src/astarnavigator/TileNavigator.php @@ -63,6 +63,9 @@ class TileNavigator } $visited = []; $maxDist*=$maxDist; //no square root + $closestToTarget = null; + $closestToTargetDist = INF; + while(!$open->isEmpty()) { $current = $open->top(); @@ -99,6 +102,12 @@ class TileNavigator } $visited[$neighbor] = true; + $diffX = ($toX - ($neighbor >> 16 & 0xff)); + $diffY = ($toY - ($neighbor & 0xff)); + $diffZ = ($toZ - ($neighbor >> 8 & 0xff)); + $targetDist = $diffX*$diffX + $diffY*$diffY + $diffZ*$diffZ; + + $diffX = ($currentX - ($neighbor >> 16 & 0xff)); $diffY = ($currentY - ($neighbor & 0xff)); $diffZ = ($currentZ - ($neighbor >> 8 & 0xff)); @@ -109,6 +118,7 @@ class TileNavigator { //if(isset($open[-$tentativeG])) console("overwriting $tentativeG"); //$open[-$tentativeG] = $neighbor; + $open->insert($neighbor, -$tentativeG); $has[$neighbor] = true; } @@ -118,12 +128,23 @@ class TileNavigator } if(!isset($gScore[$neighbor]) || $distbetweenCost < $gScore[$neighbor]){ $path[$neighbor] = $current; + + if($targetDist < $closestToTargetDist){ + console("found new best to target: $neighbor($closestToTargetDist -> $targetDist)"); + + $closestToTarget = $neighbor; + $closestToTargetDist = $targetDist; + } } $gScore[$neighbor] = $tentativeG; } } + if($closestToTarget != null){ + return $this->reconstructPath($path, $closestToTarget); + } + return null; } diff --git a/src/entity/ai/path/PathFollower.php b/src/entity/ai/path/PathFollower.php index 72387d8f..a48a2293 100644 --- a/src/entity/ai/path/PathFollower.php +++ b/src/entity/ai/path/PathFollower.php @@ -21,8 +21,8 @@ class PathFollower{ $moveX = ($this->entity->currentNode >> 16 & 0xff) + 0.5; $moveY = $this->entity->currentNode & 0xff; $moveZ = ($this->entity->currentNode >> 8 & 0xff) + 0.5; - $this->entity->ai->mobController->setMovingTarget($moveX + 0.5, $moveY, $moveZ + 0.5, 1.0); - if($this->entity->boundingBox->isXYZInsideNS($moveX + 0.5, $moveY, $moveZ + 0.5)){ + $this->entity->ai->mobController->setMovingTarget($moveX, $moveY, $moveZ, 1.0); + if($this->entity->boundingBox->isXYZInsideNS($moveX, $moveY, $moveZ)){ ++$this->entity->currentIndex; console("next"); $this->entity->currentNode = null;