From 1493ae3536ddfd0277ab001dbec347ef849ed3da Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Sat, 5 May 2018 10:19:30 +0200 Subject: [PATCH] add extra option within containLineInPath --- src/sliceActions/helpers/comb.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/sliceActions/helpers/comb.js b/src/sliceActions/helpers/comb.js index e932808..aa70756 100644 --- a/src/sliceActions/helpers/comb.js +++ b/src/sliceActions/helpers/comb.js @@ -2,7 +2,6 @@ import { subtract, add, normalize, dot, distanceTo, divide, normal } from './vec import earcut from 'earcut'; const TRIANGULATED_OUTLINES = new WeakMap(); - export default function comb(outline, 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); if (!intersection) { - // line = containLineInPath(path.slice(0, i), start, lastPoint, vertices); - const distanceA = distanceTo(lastPoint, vertexA) + distanceTo(vertexA, 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); } }