godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70485 from Chaosus/fix_astargrid_jumping

Browse Source
This commit is contained in:
Yuri Rubinsky 2023-01-07 00:04:28 +03:00 committed by GitHub
commit 60515f62bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/math/a_star_grid_2d.cpp
View File

@ -246,17 +246,11 @@ AStarGrid2D::Point *AStarGrid2D::_jump(Point *p_from, Point *p_to) {
} }
} else { // DIAGONAL_MODE_NEVER } else { // DIAGONAL_MODE_NEVER
if (dx != 0) { if (dx != 0) {
if (!_is_walkable(to_x + dx, to_y)) { if ((_is_walkable(to_x, to_y - 1) && !_is_walkable(to_x - dx, to_y - 1)) || (_is_walkable(to_x, to_y + 1) && !_is_walkable(to_x - dx, to_y + 1))) {
return p_to; return p_to;
} }
if (_jump(p_to, _get_point(to_x, to_y + 1)) != nullptr) { } else if (dy != 0) {
return p_to; if ((_is_walkable(to_x - 1, to_y) && !_is_walkable(to_x - 1, to_y - dy)) || (_is_walkable(to_x + 1, to_y) && !_is_walkable(to_x + 1, to_y - dy))) {
}
if (_jump(p_to, _get_point(to_x, to_y - 1)) != nullptr) {
return p_to;
}
} else {
if (!_is_walkable(to_x, to_y + dy)) {
return p_to; return p_to;
} }
if (_jump(p_to, _get_point(to_x + 1, to_y)) != nullptr) { if (_jump(p_to, _get_point(to_x + 1, to_y)) != nullptr) {
@ -266,9 +260,7 @@ AStarGrid2D::Point *AStarGrid2D::_jump(Point *p_from, Point *p_to) {
return p_to; return p_to;
} }
} }
if (_is_walkable(to_x + dx, to_y + dy) && _is_walkable(to_x + dx, to_y) && _is_walkable(to_x, to_y + dy)) { return _jump(p_to, _get_point(to_x + dx, to_y + dy));
return _jump(p_to, _get_point(to_x + dx, to_y + dy));
}
} }
return nullptr; return nullptr;
} }