Skip to content

Commit 7ad5ee5

Browse files
Fix corner cutting (#58)
* Fixed missing argument to isTileWalkable() when !allowCornerCutting. (#57) * Add regression and bump version
1 parent 704dca7 commit 7ad5ee5

File tree

9 files changed

+54
-28
lines changed

9 files changed

+54
-28
lines changed

bin/easystar-0.4.1.min.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ var EasyStar =
4343
/************************************************************************/
4444
/******/ ([
4545
/* 0 */
46-
/***/ function(module, exports, __webpack_require__) {
46+
/***/ (function(module, exports, __webpack_require__) {
4747

4848
/**
4949
* EasyStar.js
@@ -440,28 +440,28 @@ var EasyStar =
440440
if (diagonalsEnabled) {
441441
if (searchNode.x > 0 && searchNode.y > 0) {
442442

443-
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y)) {
443+
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y, searchNode)) {
444444

445445
checkAdjacentNode(instance, searchNode, -1, -1, DIAGONAL_COST * getTileCost(searchNode.x - 1, searchNode.y - 1));
446446
}
447447
}
448448
if (searchNode.x < collisionGrid[0].length - 1 && searchNode.y < collisionGrid.length - 1) {
449449

450-
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y)) {
450+
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y, searchNode)) {
451451

452452
checkAdjacentNode(instance, searchNode, 1, 1, DIAGONAL_COST * getTileCost(searchNode.x + 1, searchNode.y + 1));
453453
}
454454
}
455455
if (searchNode.x < collisionGrid[0].length - 1 && searchNode.y > 0) {
456456

457-
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y)) {
457+
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y - 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x + 1, searchNode.y, searchNode)) {
458458

459459
checkAdjacentNode(instance, searchNode, 1, -1, DIAGONAL_COST * getTileCost(searchNode.x + 1, searchNode.y - 1));
460460
}
461461
}
462462
if (searchNode.x > 0 && searchNode.y < collisionGrid.length - 1) {
463463

464-
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y)) {
464+
if (allowCornerCutting || isTileWalkable(collisionGrid, acceptableTiles, searchNode.x, searchNode.y + 1, searchNode) && isTileWalkable(collisionGrid, acceptableTiles, searchNode.x - 1, searchNode.y, searchNode)) {
465465

466466
checkAdjacentNode(instance, searchNode, -1, 1, DIAGONAL_COST * getTileCost(searchNode.x - 1, searchNode.y + 1));
467467
}
@@ -572,9 +572,9 @@ var EasyStar =
572572
EasyStar.LEFT = 'LEFT';
573573
EasyStar.TOP_LEFT = 'TOP_LEFT';
574574

575-
/***/ },
575+
/***/ }),
576576
/* 1 */
577-
/***/ function(module, exports) {
577+
/***/ (function(module, exports) {
578578

579579
/**
580580
* Represents a single instance of EasyStar.
@@ -591,9 +591,9 @@ var EasyStar =
591591
this.openList;
592592
};
593593

594-
/***/ },
594+
/***/ }),
595595
/* 2 */
596-
/***/ function(module, exports) {
596+
/***/ (function(module, exports) {
597597

598598
/**
599599
* A simple Node that represents a single tile on the grid.
@@ -618,15 +618,15 @@ var EasyStar =
618618
};
619619
};
620620

621-
/***/ },
621+
/***/ }),
622622
/* 3 */
623-
/***/ function(module, exports, __webpack_require__) {
623+
/***/ (function(module, exports, __webpack_require__) {
624624

625625
module.exports = __webpack_require__(4);
626626

627-
/***/ },
627+
/***/ }),
628628
/* 4 */
629-
/***/ function(module, exports, __webpack_require__) {
629+
/***/ (function(module, exports, __webpack_require__) {
630630

631631
var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;// Generated by CoffeeScript 1.8.0
632632
(function () {
@@ -994,5 +994,5 @@ var EasyStar =
994994
});
995995
}).call(this);
996996

997-
/***/ }
997+
/***/ })
998998
/******/ ]);

0 commit comments

Comments
 (0)