vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-10-23 01:22:30 +02:00
Code Issues Projects Releases Wiki Activity

add extra option within containLineInPath

Browse Source
This commit is contained in:
Casper Lamboo 2018-05-05 10:19:30 +02:00
parent 5900bbcc50
commit 1493ae3536
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ import { subtract, add, normalize, dot, distanceTo, divide, normal } from './vec
import earcut from 'earcut'; import earcut from 'earcut';
const TRIANGULATED_OUTLINES = new WeakMap(); const TRIANGULATED_OUTLINES = new WeakMap();
export default function comb(outline, start, end) { export default function comb(outline, start, end) {
if (distanceTo(start, end) < 3) return [start, end]; if (distanceTo(start, end) < 3) return [start, end];
@ -215,12 +214,12 @@ export function containLineInPath(path, start, end, vertices) {
const intersection = lineIntersection(lastPoint, end, vertexA, vertexB); const intersection = lineIntersection(lastPoint, end, vertexA, vertexB);
if (!intersection) { if (!intersection) {
// 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);
const newPoint = distanceA < distanceB ? vertexA : vertexB;
line.push(distanceA < distanceB ? vertexA : vertexB); // line = containLineInPath(path.slice(0, i), start, newPoint, vertices);
line.push(newPoint);
} }
} }