From b77c146a7ebf8fcc9b723a811ca7f0ef643057fe Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Mon, 6 Aug 2018 07:48:37 +0200 Subject: [PATCH] construction: Front neck opening --- packages/brian/src/base.js | 1 - packages/brian/src/front.js | 23 +++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/packages/brian/src/base.js b/packages/brian/src/base.js index d368a8c2f6a..8405a880dbc 100644 --- a/packages/brian/src/base.js +++ b/packages/brian/src/base.js @@ -99,7 +99,6 @@ var base = { points._tmp4, points.cbNeck.y ); - points.neckCp2 = points.cbNeck.shift(0, points.cbNeck.dx(points.neck) / 2); // Anchor point for sampling points.gridAnchor = points.cbHips; diff --git a/packages/brian/src/front.js b/packages/brian/src/front.js index a5349c5361b..798fc39324c 100644 --- a/packages/brian/src/front.js +++ b/packages/brian/src/front.js @@ -6,16 +6,31 @@ var front = { let part = new pattern.Part().copy(pattern.parts.back); // prettier-ignore - let {sa, point, points, Path, paths, Snippet, snippets, options, measurements, final, paperless, macro} = freesewing.utils.shorthand(part); + let {sa, Point, points, Path, paths, Snippet, snippets, options, measurements, final, paperless, macro} = freesewing.utils.shorthand(part); + // Cut arm a bit deeper at the front let deeper = measurements.chestCircumference * options.frontArmholeDeeper; points.armholeHollowCp2.x -= deeper; points.armholePitch.x -= deeper; points.armholePitchCp1.x -= deeper; + // Rename cb (center back) to cf (center front) + for (let key of ["Neck", "Shoulder", "Armhole", "Waist", "Hips"]) { + console.log("key is", key); + points[`cf${key}`] = new Point( + points[`cb${key}`].x, + points[`cb${key}`].y + ); + delete points[`cb${key}`]; + } + + // Adapt neck opening + points.cfNeck = points.cfNeck.shift(-90, points.neck.x); + points.neckCp2 = points.cfNeck.shift(0, points.neck.x * 0.7); + paths.seam = new Path() - .move(points.cbNeck) - .line(points.cbHips) + .move(points.cfNeck) + .line(points.cfHips) .line(points.hips) .line(points.armhole) .curve(points.armholeCp1, points.armholeCp2, points.armholeHollow) @@ -26,7 +41,7 @@ var front = { ) .curve(points.armholePitchCp1, points.armholePitchCp2, points.shoulder) .line(points.neck) - .curve(points.neckCp1, points.cbNeck, points.cbNeck) + .curve(points.neckCp1, points.neckCp2, points.cfNeck) .close() .attr("class", "fabric");