From a5f141a586fe20cffb776f29494cb82e6599ce64 Mon Sep 17 00:00:00 2001 From: Wouter van Wageningen Date: Fri, 28 Apr 2023 18:26:55 +0000 Subject: [PATCH] Docs and code cleanup --- designs/examples/src/utils.mjs | 6 +++--- .../dev/reference/api/utils/beamintersectscurve/en.md | 8 ++++---- packages/core/src/utils.mjs | 1 - 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/designs/examples/src/utils.mjs b/designs/examples/src/utils.mjs index 3126b453eba..ccc1eb42b6b 100644 --- a/designs/examples/src/utils.mjs +++ b/designs/examples/src/utils.mjs @@ -89,10 +89,10 @@ export const utils_beamintersectscurve = { draft: ({ Point, points, Path, paths, Snippet, snippets, utils, part }) => { points.A = new Point(10, 10) points.Acp = new Point(10, 40) - points.B = new Point(110, 70) + points.B = new Point(110, 10) points.Bcp = new Point(110, 40) - points.E = new Point(50, 14) - points.D = new Point(55, 16) + points.E = new Point(45, 25) + points.D = new Point(65, 25) paths.curve = new Path().move(points.A).curve(points.Acp, points.Bcp, points.B) paths.line = new Path().move(points.E).line(points.D) diff --git a/markdown/dev/reference/api/utils/beamintersectscurve/en.md b/markdown/dev/reference/api/utils/beamintersectscurve/en.md index 8b4b66459e8..16d4d102319 100644 --- a/markdown/dev/reference/api/utils/beamintersectscurve/en.md +++ b/markdown/dev/reference/api/utils/beamintersectscurve/en.md @@ -36,15 +36,15 @@ array | false utils.beamIntersectsCurve( points.A = new Point(10, 10) points.Acp = new Point(10, 40) - points.B = new Point(110, 70) + points.B = new Point(110, 10) points.Bcp = new Point(110, 40) - points.E = new Point(50, 14) - points.D = new Point(55, 16) + points.E = new Point(45, 25) + points.D = new Point(65, 25) paths.curve = new Path() .move(points.A) .curve(points.Acp, points.Bcp, points.B) paths.line = new Path().move(points.E).line(points.D) - + for (let p of utils.beamIntersectsCurve( points.D, points.E, diff --git a/packages/core/src/utils.mjs b/packages/core/src/utils.mjs index 11b49f8b5f8..c3bdf013599 100644 --- a/packages/core/src/utils.mjs +++ b/packages/core/src/utils.mjs @@ -126,7 +126,6 @@ export function beamsIntersect(a1, a2, b1, b2) { export function beamIntersectsCurve(start, end, from, cp1, cp2, to) { let _start = new Point(start.x + (start.x - end.x) * 1000, start.y + (start.y - end.y) * 1000) let _end = new Point(end.x + (end.x - start.x) * 1000, end.y + (end.y - start.y) * 1000) - console.log({ _start: _start, _end: _end }) return lineIntersectsCurve(_start, _end, from, cp1, cp2, to) }