mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-21 12:09:43 +00:00
code style fix
This commit is contained in:
parent
fc5c5625cb
commit
5e8e9330e2
361 changed files with 4766 additions and 4650 deletions
|
|
@ -1,14 +1,15 @@
|
|||
<?php
|
||||
|
||||
class TileNavigator
|
||||
{
|
||||
|
||||
|
||||
const OFFSETS = [
|
||||
[0, 0, 1],
|
||||
[0, 0, -1],
|
||||
[1, 0, 0],
|
||||
[-1, 0, 0],
|
||||
];
|
||||
|
||||
|
||||
public static $pathfinderAccessed = 0;
|
||||
public $entity;
|
||||
public $avoidFallDamage = true;
|
||||
|
|
@ -17,13 +18,13 @@ class TileNavigator
|
|||
$this->entity = $entity;
|
||||
$this->tall = $entity->height > 1;
|
||||
}
|
||||
|
||||
|
||||
public function reconstructPath($path, $current){
|
||||
console("path built");
|
||||
$totalPath = [$current];
|
||||
while (isset($path[(string)$current]))
|
||||
while (isset($path[(string) $current]))
|
||||
{
|
||||
$current = $path[(string)$current];
|
||||
$current = $path[(string) $current];
|
||||
$totalPath[] = $current;
|
||||
}
|
||||
//foreach(array_unique($path) as $k => $p) console($k.":".$p);
|
||||
|
|
@ -33,17 +34,17 @@ class TileNavigator
|
|||
}
|
||||
|
||||
public function isLocBlocked(PMFLevel $level, $loc){
|
||||
|
||||
|
||||
$chunkX = $loc >> 20 & 0xf;
|
||||
$chunkZ = $loc >> 12 & 0xf;
|
||||
$chunkY = $loc >> 4 & 0xf;
|
||||
|
||||
|
||||
$index = $chunkZ << 4 | $chunkX;
|
||||
|
||||
|
||||
$blockX = $loc >> 16 & 0xf;
|
||||
$blockZ = $loc >> 8 & 0xf;
|
||||
$blockY = $loc & 0xf;
|
||||
|
||||
|
||||
$id = $level->fastGetBlockID($chunkX, $chunkY, $chunkZ, $blockX, $blockY, $blockZ, $index);
|
||||
$b = StaticBlock::getIsSolid($id);
|
||||
if($this->tall){
|
||||
|
|
@ -53,33 +54,32 @@ class TileNavigator
|
|||
$id = $level->fastGetBlockID($chunkX, $chunkY, $chunkZ, $blockX, $blockY, $blockZ, $index);
|
||||
return $b || StaticBlock::getIsSolid($id);
|
||||
}
|
||||
|
||||
|
||||
return $b;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function navigate(Level $level, $fromX, $fromY, $fromZ, $toX, $toY, $toZ, $maxDist)
|
||||
{
|
||||
$from = $fromX << 16 | $fromZ << 8 | $fromY;
|
||||
$to = $toX << 16 | $toZ << 8 | $toY;
|
||||
|
||||
|
||||
$pmfLevel = $level->level;
|
||||
|
||||
|
||||
$open = new SplPriorityQueue();
|
||||
//$open->insert(, 0);
|
||||
$open->insert($from, 0);
|
||||
$path = [];
|
||||
$gScore = [];
|
||||
$gScore[(string) $from] = 0;
|
||||
$has = [(string)$from, true];
|
||||
$has = [(string) $from, true];
|
||||
if($this->isLocBlocked($pmfLevel, $to)){
|
||||
return null;
|
||||
}
|
||||
$visited = [];
|
||||
$maxDist*=$maxDist; //no square root
|
||||
$maxDist *= $maxDist; //no square root
|
||||
$closestToTarget = null;
|
||||
$closestToTargetDist = INF;
|
||||
|
||||
|
||||
while(!$open->isEmpty())
|
||||
{
|
||||
$current = $open->top();
|
||||
|
|
@ -90,7 +90,7 @@ class TileNavigator
|
|||
if ($current == $to){
|
||||
return $this->reconstructPath($path, $current);
|
||||
}
|
||||
|
||||
|
||||
$points = [];
|
||||
foreach(self::OFFSETS as $offset){
|
||||
$newX = $offset[0] + $currentX;
|
||||
|
|
@ -98,7 +98,7 @@ class TileNavigator
|
|||
$newZ = $offset[2] + $currentZ;
|
||||
if($newX < 0 || $newX > 255 || $newY < 0 || $newY > 255 || $newZ < 0 || $newZ > 255) continue;
|
||||
$new = $newX << 16 | $newZ << 8 | $newY;
|
||||
|
||||
|
||||
if(!$this->isLocBlocked($pmfLevel, $new)){
|
||||
if($newY > 0 && !$this->isLocBlocked($pmfLevel, $new - 1)){
|
||||
if(!$this->avoidFallDamage){
|
||||
|
|
@ -108,60 +108,59 @@ class TileNavigator
|
|||
if($this->isLocBlocked($pmfLevel, $new - 2)){
|
||||
$new -= 1;
|
||||
$newY -= 1;
|
||||
}else if($this->isLocBlocked($pmfLevel, $new - 3)){
|
||||
}elseif($this->isLocBlocked($pmfLevel, $new - 3)){
|
||||
$new -= 2;
|
||||
$newY -= 2;
|
||||
}else if($this->isLocBlocked($pmfLevel, $new - 4)){
|
||||
}elseif($this->isLocBlocked($pmfLevel, $new - 4)){
|
||||
$new -= 3;
|
||||
$newY -= 3;
|
||||
}else{
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
$dist = ($fromX - $newX)*($fromX - $newX) + ($fromY - $newY)*($fromY - $newY) + ($fromZ - $newZ)*($fromZ - $newZ);
|
||||
$dist = ($fromX - $newX) * ($fromX - $newX) + ($fromY - $newY) * ($fromY - $newY) + ($fromZ - $newZ) * ($fromZ - $newZ);
|
||||
if($dist < -$maxDist || $dist > $maxDist){
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$points[] = $new;
|
||||
}else if(!$this->isLocBlocked($pmfLevel, $current+1) && !$this->isLocBlocked($pmfLevel, $new+1)){
|
||||
}elseif(!$this->isLocBlocked($pmfLevel, $current + 1) && !$this->isLocBlocked($pmfLevel, $new + 1)){
|
||||
$new += 1;
|
||||
$newY += 1;
|
||||
|
||||
$dist = ($fromX - $newX)*($fromX - $newX) + ($fromY - $newY)*($fromY - $newY) + ($fromZ - $newZ)*($fromZ - $newZ);
|
||||
|
||||
$dist = ($fromX - $newX) * ($fromX - $newX) + ($fromY - $newY) * ($fromY - $newY) + ($fromZ - $newZ) * ($fromZ - $newZ);
|
||||
if($dist < -$maxDist || $dist > $maxDist){
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$points[] = $new;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
foreach($points as $neighbor)
|
||||
{
|
||||
if(isset($visited[$neighbor])){
|
||||
continue;
|
||||
}
|
||||
$visited[$neighbor] = true;
|
||||
|
||||
|
||||
$diffX = ($toX - ($neighbor >> 16 & 0xff));
|
||||
$diffY = ($toY - ($neighbor & 0xff));
|
||||
$diffZ = ($toZ - ($neighbor >> 8 & 0xff));
|
||||
$targetDist = $diffX*$diffX + $diffY*$diffY + $diffZ*$diffZ;
|
||||
|
||||
|
||||
$targetDist = $diffX * $diffX + $diffY * $diffY + $diffZ * $diffZ;
|
||||
|
||||
$diffX = ($currentX - ($neighbor >> 16 & 0xff));
|
||||
$diffY = ($currentY - ($neighbor & 0xff));
|
||||
$diffZ = ($currentZ - ($neighbor >> 8 & 0xff));
|
||||
|
||||
$distbetweenCost = $diffX*$diffX + $diffY*$diffY + $diffZ*$diffZ;
|
||||
|
||||
$distbetweenCost = $diffX * $diffX + $diffY * $diffY + $diffZ * $diffZ;
|
||||
$tentativeG = $gScore[$current] + $distbetweenCost;
|
||||
if (!isset($has[$neighbor]))
|
||||
{
|
||||
{
|
||||
//if(isset($open[-$tentativeG])) console("overwriting $tentativeG");
|
||||
//$open[-$tentativeG] = $neighbor;
|
||||
|
||||
|
||||
$open->insert($neighbor, -$tentativeG);
|
||||
$has[$neighbor] = true;
|
||||
}
|
||||
|
|
@ -171,26 +170,25 @@ 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;
|
||||
$closestToTargetDist = $targetDist;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$gScore[$neighbor] = $tentativeG;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if($closestToTarget != null){
|
||||
return $this->reconstructPath($path, $closestToTarget);
|
||||
}
|
||||
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue