vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-11-22 05:37:55 +01:00
Code Issues Projects Releases Wiki Activity

update containLineInPath func

Browse Source
This commit is contained in:
Casper Lamboo 2018-05-02 17:39:27 +02:00
parent 942addf8d7
commit c642375295
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sliceActions/helpers/comb.js
View File

@ -205,16 +205,18 @@ function findClosestPath(map, start, end) {
} }
function containLineInPath(path, start, end, vertices) { function containLineInPath(path, start, end, vertices) {
const line = [start]; let line = [start];
for (let i = 0; i < path.length; i ++) { for (let i = 0; i < path.length; i ++) {
const { edge: [indexA, indexB] } = path[i]; const { edge: [indexA, indexB] } = path[i];
const vertexA = vertices[indexA]; const vertexA = vertices[indexA];
const vertexB = vertices[indexB]; const vertexB = vertices[indexB];
const lastPoint = line[line.length - 1];
const intersection = lineIntersection(start, end, vertexA, vertexB); const intersection = lineIntersection(lastPoint, end, vertexA, vertexB);
if (!intersection) { if (!intersection) {
const lastPoint = line[line.length - 1]; line = containLineInPath(path.slice(0, i), start, lastPoint, vertices);
const distanceA = distanceTo(lastPoint, vertexA) + distanceTo(vertexA, end); const distanceA = distanceTo(lastPoint, vertexA) + distanceTo(vertexA, end);
const distanceB = distanceTo(lastPoint, vertexB) + distanceTo(vertexB, end); const distanceB = distanceTo(lastPoint, vertexB) + distanceTo(vertexB, end);