use options parameter instead of parameter list. Issue bgrins#12 and …

…Issue bgrins#16
explodingbarrel · Mar 1, 2014 · 983f094 · 983f094
1 parent 11cb0e1
commit 983f094
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/astar.js b/astar.js
@@ -37,12 +37,21 @@ var astar = {
             return node.f;
         });
     },
-    search: function(grid, start, end, diagonal, heuristic, costStraight, costDiagonal) {
-        costDiagonal = costDiagonal || 1;
-        costStraight = costStraight || 1;
+
+    // astar.search
+    // supported options:
+    // {
+    //   heuristic: heuristic function to use
+    //   diagonal: boolean specifying whether diagonal moves are allowed
+    // }
+    search: function(grid, start, end, options) {
         astar.init(grid);
-        heuristic = heuristic || astar.manhattan;
-        diagonal = !!diagonal;
+
+        options = options || {};
+        var heuristic = options.heuristic || astar.manhattan;
+        var diagonal = !!options.diagonal;
+        var costDiagonal = options.costDiagonal || 1;
+        var costStraight = options.costStraight || 1;
 
         var openHeap = astar.heap();
 

diff --git a/demo/demo.js b/demo/demo.js
@@ -170,7 +170,9 @@ GraphSearch.prototype.cellClicked = function($end) {
    	var start = this.nodeFromElement($start);
 
 	var sTime = new Date();
-    var path = this.search(this.graph.nodes, start, end, this.opts.diagonal);
+    var path = this.search(this.graph.nodes, start, end, {
+        diagonal: this.opts.diagonal
+    });
 	var fTime = new Date();
 
 	if(!path || path.length == 0)	{