Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion www/grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,23 @@ function addObstacle(fX, fZ, tX, tZ) {
const v = {fX : fX, fZ : fZ, tX : tX, tZ : tZ, line : vline };
obstacles.push(v);
renderer.render( scene, camera );
var val = "";
for (const obstacle of obstacles) {
val += outVal(obstacle.fX) + outVal(obstacle.fZ)
+ outVal(obstacle.tX) + outVal(obstacle.tZ);
}
console.log("boarders " + borders.length + " obstacles " + obstacles.length);
console.log("val " + val);
let res = ocamlLib.nointersection(val);
console.log("intersection?");
console.log(res);
if (res == "false") {
console.log("cancelling");
addObstacle(fX, fZ, tX, tZ);
return;
}
cleanCells();
getCells();
getCells();
}


Expand Down
2 changes: 1 addition & 1 deletion www/jSmoothTrajectories.ml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ let call_cells s =
let _ =
Js.export "ocamlLib"
(object%js
method no_intersection s =
method nointersection s =
Js.string (call_no_intersections (Js.to_string s))
method straight s = Js.string (call_straight (Js.to_string s))
method smooth s = Js.string (call_smooth (Js.to_string s))
Expand Down
Loading