Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-07 04:58:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update Grid.php

Browse Source
This commit is contained in:
Dennis Eichhorn 2019-08-20 16:36:14 +02:00 committed by GitHub
parent 095fd15607
commit 6efc4e157b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Algorithm/PathFinding/Grid.php
View File

@ -51,7 +51,7 @@ class Grid
$x = $node->getX(); $x = $node->getX();
$y = $node->getY(); $y = $node->getY();
$neighbours = []; $neighbors = [];
$s0 = false; $s0 = false;
$s1 = false; $s1 = false;
$s2 = false; $s2 = false;
@ -61,30 +61,28 @@ class Grid
$d2 = false; $d2 = false;
$d3 = false; $d3 = false;
$nodes = $this->nodes;
if ($this->getNode($x, $y - 1)->isWalkable()) { if ($this->getNode($x, $y - 1)->isWalkable()) {
$neighbours[$x][$y - 1]; $neighbors[$x][$y - 1];
$s0 = true; $s0 = true;
} }
if ($this->getNode($x + 1, $y)->isWalkable()) { if ($this->getNode($x + 1, $y)->isWalkable()) {
$neighbours[$x + 1][$y]; $neighbors[$x + 1][$y];
$s1 = true; $s1 = true;
} }
if ($this->getNode($x, $y + 1)->isWalkable()) { if ($this->getNode($x, $y + 1)->isWalkable()) {
$neighbours[$x][$y + 1]; $neighbors[$x][$y + 1];
$s2 = true; $s2 = true;
} }
if ($this->getNode($x - 1, $y)->isWalkable()) { if ($this->getNode($x - 1, $y)->isWalkable()) {
$neighbours[$x - 1][$y]; $neighbors[$x - 1][$y];
$s3 = true; $s3 = true;
} }
if ($movement === MovementType::STRAIGHT) { if ($movement === MovementType::STRAIGHT) {
return $neighbours; return $neighbors;
} }
if ($movement === MovementType::DIAGONAL_NO_OBSTACLE) { if ($movement === MovementType::DIAGONAL_NO_OBSTACLE) {
@ -97,11 +95,29 @@ class Grid
$d1 = $s0 || $s1; $d1 = $s0 || $s1;
$d2 = $s1 || $s2; $d2 = $s1 || $s2;
$d3 = $s2 || $s3; $d3 = $s2 || $s3;
} else if ($movement === MovementType::DIAGONAL) { } elseif ($movement === MovementType::DIAGONAL) {
$d0 = true; $d0 = true;
$d1 = true; $d1 = true;
$d2 = true; $d2 = true;
$d3 = true; $d3 = true;
} }
if ($d0 && $this->getNode($x - 1, $y - 1)->isWalkable()) {
$neighbors[] = $this->getNode($x - 1, $y - 1]);
}
if ($d1 && $this->getNode($x + 1, $y - 1)->isWalkable()) {
$neighbors[] = $this->getNode($x + 1, $y - 1);
}
if ($d2 && $this->getNode($x + 1, $y + 1)->isWalkable()) {
$neighbors[] = $this->getNode($x + 1, $y + 1);
}
if ($d3 && $this->getNode($x - 1, $y + 1)->isWalkable()) {
$neighbors[] = $this->getNode($x - 1, $y + 1);
}
return $neighbors;
} }
} }