VSinerva/freesewing
1
0
Fork 0
Code Activity

feat(simon): Allow configuring the yoke. Closes #642

Browse source
This commit is contained in:
Joost De Cock 2021-06-20 09:01:37 +02:00
parent b0d901fe68
commit af2ee352c7
5 changed files with 61 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
packages/simon/src/back.js
View file

@ -77,7 +77,27 @@ export default (part) => {
points.hipsCp2 = points.hips.shift(90, points.waist.dy(points.hips) / 4)
// Cut off at yoke
points.cbYoke = new Point(0, points.armholePitch.y)
const neverAboveCbNeck = () => (points.cbNeck.dy(points.cbYoke) < 10) ? (points.cbYoke.y = points.cbNeck.y + 10) : null
if (options.yokeHeight === 1) {
points.cbYoke = new Point(0, points.armholePitch.y)
neverAboveCbNeck()
points.armholeYokeSplit = points.armholePitch.clone()
paths.backArmholeYoke = paths.backArmhole
}
else if (options.yokeHeight === 0) {
points.cbYoke = new Point(0, points.s3ArmholeSplit.y)
neverAboveCbNeck()
points.armholeYokeSplit = points.s3ArmholeSplit.clone()
paths.backArmholeBack = paths.backArmhole
} else {
points.cbYoke = new Point(0, points.s3ArmholeSplit.y + (points.s3ArmholeSplit.dy(points.armholePitch) * options.yokeHeight))
neverAboveCbNeck()
points.armholeYokeSplit = paths.backArmhole.intersectsY(points.cbYoke.y).pop()
const [back,yoke] = paths.backArmhole.split(points.armholeYokeSplit)
paths.backArmholeYoke = yoke.setRender(false)
paths.backArmholeBack = back.setRender(false)
}
// Box pleat
if (options.boxPleat) {
@ -104,6 +124,10 @@ export default (part) => {
.move(points.armhole)
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
if (options.yokeHeight < 1 && options.yokeHeight > 0) paths.armhole = paths.armhole.join(paths.backArmholeBack)
else if (options.yokeHeight === 0) paths.armhole = paths.armhole.join(paths.backArmhole)
/*
paths.armhole.render = false
if (options.yokeDart > 0) {
points.tmp1 = points.armholePitch.shift(
@ -130,7 +154,7 @@ export default (part) => {
store.get('backArmholeLength') - points.yokeDartEdge.dist(points.armholePitch)
)
}
*/
// Never make the hips more narrow than the waist because that looks silly
//if (points.hem.x < points.waist.x) {
// points.hem.x = points.waist.x

10
packages/simon/src/yoke.js
View file

@ -14,17 +14,15 @@ export default (part) => {
} = part.shorthand()
for (let id in paths) {
if (['backCollar', 'backArmhole'].indexOf(id) === -1) delete part.paths[id]
if (['backCollar', 'backArmhole', 'backArmholeYoke'].indexOf(id) === -1) delete part.paths[id]
}
// Cut off at yoke
points.cbYoke = new Point(0, points.armholePitch.y)
// Paths
paths.saBase = new Path()
.move(points.cbYoke)
.line(points.armholePitch)
.join(paths.backArmhole)
.line(points.armholeYokeSplit)
if (options.yokeHeight > 0) paths.saBase = paths.saBase.join(paths.backArmholeYoke)
paths.saBase = paths.saBase
.line(points.s3CollarSplit)
.join(paths.backCollar)
if (options.splitYoke) paths.saBase = paths.saBase.line(points.cbYoke).close()