sparkles: Added sleeve placket overlap
This commit is contained in:
Joost De Cock
parent
1bccf5c827
commit
3afdaf751d
7 changed files with 265 additions and 40 deletions
|
|
@ -6,27 +6,52 @@ export default part => {
|
|||
|
||||
// Populare store with data we need
|
||||
calculateReduction(part);
|
||||
store.set("backArmholeLength", new Path()
|
||||
store.set(
|
||||
"backArmholeLength",
|
||||
new Path()
|
||||
.move(points.armhole)
|
||||
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
|
||||
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
|
||||
.curve(
|
||||
points.armholeHollowCp2,
|
||||
points.armholePitchCp1,
|
||||
points.armholePitch
|
||||
)
|
||||
.curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
|
||||
.length());
|
||||
.length()
|
||||
);
|
||||
|
||||
// Waist shaping
|
||||
let reduce = store.get('waistReduction');
|
||||
if(reduce/4 > options.minimalDartShaping) {
|
||||
let reduce = store.get("waistReduction");
|
||||
if (reduce / 4 > options.minimalDartShaping) {
|
||||
// Add darts in the back
|
||||
points.waist = points.waist.shift(180, reduce/8);
|
||||
points.waist = points.waist.shift(180, reduce / 8);
|
||||
points.dartCenter = points.cbWaist.shiftFractionTowards(points.waist, 0.6);
|
||||
points.dartTop = points.dartCenter.shift(90, points.armhole.dy(points.waist) * 0.75);
|
||||
points.dartBottom = points.dartCenter.shift(-90, measurements.naturalWaistToHip * 0.75);
|
||||
points.dartCenterIn = points.dartCenter.shift(180, reduce/8);
|
||||
points.dartCenterOut = points.dartCenter.shift(0, reduce/8);
|
||||
points.dartCenterInCp1 = points.dartCenterIn.shift(90, points.dartTop.dy(points.dartCenter) * 0.2);
|
||||
points.dartCenterInCp2 = points.dartCenterIn.shift(90, points.dartBottom.dy(points.dartCenter) * 0.2);
|
||||
points.dartCenterOutCp1 = points.dartCenterOut.shift(90, points.dartBottom.dy(points.dartCenter) * 0.2);
|
||||
points.dartCenterOutCp2 = points.dartCenterOut.shift(90, points.dartTop.dy(points.dartCenter) * 0.2);
|
||||
points.dartTop = points.dartCenter.shift(
|
||||
90,
|
||||
points.armhole.dy(points.waist) * 0.75
|
||||
);
|
||||
points.dartBottom = points.dartCenter.shift(
|
||||
-90,
|
||||
measurements.naturalWaistToHip * 0.75
|
||||
);
|
||||
points.dartCenterIn = points.dartCenter.shift(180, reduce / 8);
|
||||
points.dartCenterOut = points.dartCenter.shift(0, reduce / 8);
|
||||
points.dartCenterInCp1 = points.dartCenterIn.shift(
|
||||
90,
|
||||
points.dartTop.dy(points.dartCenter) * 0.2
|
||||
);
|
||||
points.dartCenterInCp2 = points.dartCenterIn.shift(
|
||||
90,
|
||||
points.dartBottom.dy(points.dartCenter) * 0.2
|
||||
);
|
||||
points.dartCenterOutCp1 = points.dartCenterOut.shift(
|
||||
90,
|
||||
points.dartBottom.dy(points.dartCenter) * 0.2
|
||||
);
|
||||
points.dartCenterOutCp2 = points.dartCenterOut.shift(
|
||||
90,
|
||||
points.dartTop.dy(points.dartCenter) * 0.2
|
||||
);
|
||||
paths.dart = new Path()
|
||||
.move(points.dartTop)
|
||||
._curve(points.dartCenterInCp1, points.dartCenterIn)
|
||||
|
|
@ -34,25 +59,35 @@ export default part => {
|
|||
._curve(points.dartCenterOutCp1, points.dartCenterOut)
|
||||
.curve_(points.dartCenterOutCp2, points.dartTop)
|
||||
.close()
|
||||
.attr('class', 'fabric');
|
||||
.attr("class", "fabric");
|
||||
} else {
|
||||
// No darts in the back
|
||||
points.waist = points.waist.shift(180, reduce/4);
|
||||
points.waist = points.waist.shift(180, reduce / 4);
|
||||
}
|
||||
points.waistCp1 = points.waist.shift(-90, measurements.naturalWaistToHip * 0.5);
|
||||
points.waistCp2 = points.waist.shift(90, points.armhole.dy(points.waist)/2);
|
||||
points.hipsCp2 = points.hips.shift(90, points.waist.dy(points.hips)/4);
|
||||
points.waistCp1 = points.waist.shift(
|
||||
-90,
|
||||
measurements.naturalWaistToHip * 0.5
|
||||
);
|
||||
points.waistCp2 = points.waist.shift(90, points.armhole.dy(points.waist) / 2);
|
||||
points.hipsCp2 = points.hips.shift(90, points.waist.dy(points.hips) / 4);
|
||||
|
||||
// Yoke dart
|
||||
paths.armhole = new Path()
|
||||
.move(points.armhole)
|
||||
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
|
||||
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch);
|
||||
.curve(
|
||||
points.armholeHollowCp2,
|
||||
points.armholePitchCp1,
|
||||
points.armholePitch
|
||||
);
|
||||
paths.armhole.render = false;
|
||||
if(options.yokeDart > 0) {
|
||||
points.tmp1 = points.armholePitch.shift(-90, points.armholePitch.dy(points.armhole) * options.yokeDart);
|
||||
points.tmp2 = points.tmp1.shift(180,50);
|
||||
points.tmp3 = points.tmp1.shift(0,50);
|
||||
if (options.yokeDart > 0) {
|
||||
points.tmp1 = points.armholePitch.shift(
|
||||
-90,
|
||||
points.armholePitch.dy(points.armhole) * options.yokeDart
|
||||
);
|
||||
points.tmp2 = points.tmp1.shift(180, 50);
|
||||
points.tmp3 = points.tmp1.shift(0, 50);
|
||||
points.yokeDartEdge = utils.lineIntersectsCurve(
|
||||
points.tmp2,
|
||||
points.tmp3,
|
||||
|
|
@ -61,14 +96,21 @@ export default part => {
|
|||
points.armholeHollowCp2,
|
||||
points.armholeHollow
|
||||
);
|
||||
points.yokeDartTip = points.armholePitch.shift(180, points.armholePitch.x * 0.4);
|
||||
points.yokeDartTipCp1 = points.armholePitch.shiftFractionTowards(points.yokeDartTip, 0.4);
|
||||
points.yokeDartTip = points.armholePitch.shift(
|
||||
180,
|
||||
points.armholePitch.x * 0.4
|
||||
);
|
||||
points.yokeDartTipCp1 = points.armholePitch.shiftFractionTowards(
|
||||
points.yokeDartTip,
|
||||
0.4
|
||||
);
|
||||
paths.armhole = paths.armhole.split(points.yokeDartEdge)[0];
|
||||
paths.armhole._curve(points.yokeDartTipCp1, points.yokeDartTip)
|
||||
paths.armhole._curve(points.yokeDartTipCp1, points.yokeDartTip);
|
||||
// Adapt armhole length to accomodate dart
|
||||
store.set(
|
||||
"backArmholeLength",
|
||||
store.get("backArmholeLength") - points.yokeDartEdge.dist(points.armholePitch)
|
||||
store.get("backArmholeLength") -
|
||||
points.yokeDartEdge.dist(points.armholePitch)
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -76,10 +118,13 @@ export default part => {
|
|||
points.cbYoke = new Point(0, points.armholePitch.y);
|
||||
|
||||
// Draft hem
|
||||
switch(options.hemStyle) {
|
||||
switch (options.hemStyle) {
|
||||
case "baseball":
|
||||
points.bballStart = points.cbHem.shiftFractionTowards(points.hem, 0.5);
|
||||
points.bballEnd = points.hem.shiftFractionTowards(points.hips, options.hemCurve);
|
||||
points.bballEnd = points.hem.shiftFractionTowards(
|
||||
points.hips,
|
||||
options.hemCurve
|
||||
);
|
||||
points.bballCp1 = points.bballStart.shiftFractionTowards(points.hem, 0.5);
|
||||
points.bballCp2 = new Point(points.bballCp1.x, points.bballEnd.y);
|
||||
paths.saBase = new Path()
|
||||
|
|
@ -100,7 +145,7 @@ export default part => {
|
|||
to: points.cbHem,
|
||||
via: points.hem,
|
||||
radius: points.hips.dist(points.hem) * options.hemCurve,
|
||||
prefix: "slash",
|
||||
prefix: "slash"
|
||||
});
|
||||
paths.saBase = new Path()
|
||||
.move(points.hips)
|
||||
|
|
@ -127,7 +172,10 @@ export default part => {
|
|||
// Paths
|
||||
paths.saBase.render = false;
|
||||
paths.hemBase.render = false;
|
||||
paths.seam = paths.hemBase.join(paths.saBase).close().attr('class', 'fabric');
|
||||
paths.seam = paths.hemBase
|
||||
.join(paths.saBase)
|
||||
.close()
|
||||
.attr("class", "fabric");
|
||||
|
||||
// Complete pattern?
|
||||
if (complete) {
|
||||
|
|
@ -137,14 +185,14 @@ export default part => {
|
|||
to: points.cbHem,
|
||||
grainline: true
|
||||
});
|
||||
points.title = new Point(points.armhole.x/4, points.armhole.y);
|
||||
points.title = new Point(points.armhole.x / 4, points.armhole.y);
|
||||
macro("title", { at: points.title, nr: 3, title: "back" });
|
||||
points.logo = points.title.shift(-90, 70);
|
||||
snippets.logo = new Snippet("logo", points.logo);
|
||||
|
||||
if(sa) {
|
||||
paths.sa = paths.saBase.offset(sa).attr('class', 'fabric sa');
|
||||
paths.hemSa = paths.hemBase.offset(sa*3).attr('class', 'fabric sa');
|
||||
if (sa) {
|
||||
paths.sa = paths.saBase.offset(sa).attr("class", "fabric sa");
|
||||
paths.hemSa = paths.hemBase.offset(sa * 3).attr("class", "fabric sa");
|
||||
paths.saConnect = new Path()
|
||||
.move(points.cbHem)
|
||||
.line(paths.hemSa.start())
|
||||
|
|
@ -152,7 +200,7 @@ export default part => {
|
|||
.line(paths.sa.start())
|
||||
.move(paths.sa.end())
|
||||
.line(points.cbYoke)
|
||||
.attr('class', 'fabric sa');
|
||||
.attr("class", "fabric sa");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue