sparkles: Back part
This commit is contained in:
Joost De Cock
parent
7581a6c0fb
commit
58729a32b0
14 changed files with 7025 additions and 1 deletions
168
packages/simon/src/back.js
Normal file
168
packages/simon/src/back.js
Normal file
|
|
@ -0,0 +1,168 @@
|
|||
import { calculateReduction } from "./shared";
|
||||
|
||||
export default part => {
|
||||
// prettier-ignore
|
||||
let {store, measurements, utils, sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options} = part.shorthand();
|
||||
|
||||
// Populare store with data we need
|
||||
calculateReduction(part);
|
||||
store.set("backArmholeLength", new Path()
|
||||
.move(points.armhole)
|
||||
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
|
||||
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
|
||||
.curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
|
||||
.length());
|
||||
|
||||
// Waist shaping
|
||||
let reduce = store.get('waistReduction');
|
||||
if(reduce/4 > options.minimalDartShaping) {
|
||||
// Add darts in the back
|
||||
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);
|
||||
paths.dart = new Path()
|
||||
.move(points.dartTop)
|
||||
._curve(points.dartCenterInCp1, points.dartCenterIn)
|
||||
.curve_(points.dartCenterInCp2, points.dartBottom)
|
||||
._curve(points.dartCenterOutCp1, points.dartCenterOut)
|
||||
.curve_(points.dartCenterOutCp2, points.dartTop)
|
||||
.close()
|
||||
.attr('class', 'fabric');
|
||||
} else {
|
||||
// No darts in the back
|
||||
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);
|
||||
|
||||
// Yoke dart
|
||||
paths.armhole = new Path()
|
||||
.move(points.armhole)
|
||||
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
|
||||
.curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
|
||||
.attr("class", "stroke-xxl");
|
||||
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);
|
||||
points.yokeDartEdge = utils.lineIntersectsCurve(
|
||||
points.tmp2,
|
||||
points.tmp3,
|
||||
points.armholePitch,
|
||||
points.armholePitchCp1,
|
||||
points.armholeHollowCp2,
|
||||
points.armholeHollow
|
||||
);
|
||||
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)
|
||||
// FIXME: Must adapt sleeve to compensate for this dart.
|
||||
// Perhaps by reducing sleevecap ease?
|
||||
}
|
||||
|
||||
// Cut off at yoke
|
||||
points.cbYoke = new Point(0, points.armholePitch.y);
|
||||
|
||||
// Draft hem
|
||||
switch(options.hemStyle) {
|
||||
case "baseball":
|
||||
points.bballStart = points.cbHem.shiftFractionTowards(points.hem, 0.5);
|
||||
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()
|
||||
.move(points.bballEnd)
|
||||
.line(points.hips)
|
||||
.curve(points.hipsCp2, points.waistCp1, points.waist)
|
||||
.curve_(points.waistCp2, points.armhole)
|
||||
.join(paths.armhole)
|
||||
.line(points.cbYoke)
|
||||
.attr("class", "stroke-xxl");
|
||||
paths.hemBase = new Path()
|
||||
.move(points.cbHem)
|
||||
.line(points.bballStart)
|
||||
.curve(points.bballCp1, points.bballCp2, points.bballEnd);
|
||||
|
||||
break;
|
||||
case "slashed":
|
||||
macro("round", {
|
||||
from: points.hips,
|
||||
to: points.cbHem,
|
||||
via: points.hem,
|
||||
radius: points.hips.dist(points.hem) * options.hemCurve,
|
||||
prefix: "slash",
|
||||
});
|
||||
paths.saBase = new Path()
|
||||
.move(points.hips)
|
||||
.curve(points.hipsCp2, points.waistCp1, points.waist)
|
||||
.curve_(points.waistCp2, points.armhole)
|
||||
.join(paths.armhole)
|
||||
.line(points.cbYoke)
|
||||
.attr("class", "stroke-xxl");
|
||||
paths.hemBase = new Path()
|
||||
.move(points.cbHem)
|
||||
.line(points.slashEnd)
|
||||
.curve(points.slashCp2, points.slashCp1, points.slashStart);
|
||||
break;
|
||||
default:
|
||||
paths.saBase = new Path()
|
||||
.move(points.hem)
|
||||
.line(points.hips)
|
||||
.curve(points.hipsCp2, points.waistCp1, points.waist)
|
||||
.curve_(points.waistCp2, points.armhole)
|
||||
.join(paths.armhole)
|
||||
.line(points.cbYoke)
|
||||
.attr("class", "stroke-xxl");
|
||||
paths.hemBase = new Path()
|
||||
.move(points.cbHem)
|
||||
.line(points.hem);
|
||||
}
|
||||
|
||||
// Paths
|
||||
paths.saBase.render = false;
|
||||
paths.hemBase.render = false;
|
||||
paths.seam = paths.hemBase.join(paths.saBase).close().attr('class', 'fabric');
|
||||
|
||||
// Complete pattern?
|
||||
if (complete) {
|
||||
delete snippets.armholePitchNotch;
|
||||
macro("cutonfold", {
|
||||
from: points.cbYoke,
|
||||
to: points.cbHem,
|
||||
grainline: true
|
||||
});
|
||||
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');
|
||||
paths.saConnect = new Path()
|
||||
.move(points.cbHem)
|
||||
.line(paths.hemSa.start())
|
||||
.move(paths.hemSa.end())
|
||||
.line(paths.sa.start())
|
||||
.move(paths.sa.end())
|
||||
.line(points.cbYoke)
|
||||
.attr('class', 'fabric sa');
|
||||
}
|
||||
}
|
||||
|
||||
// Paperless?
|
||||
if (paperless) {
|
||||
}
|
||||
|
||||
return part;
|
||||
};
|
||||
62
packages/simon/src/index.js
Normal file
62
packages/simon/src/index.js
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
import freesewing from "freesewing";
|
||||
import Brian from "@freesewing/brian";
|
||||
import pluginBundle from "@freesewing/plugin-bundle";
|
||||
import config from "../config/config";
|
||||
import { version } from "../package.json";
|
||||
// Parts
|
||||
import draftBack from "./back";
|
||||
//import draftFront from "./front";
|
||||
//import draftSleevecap from "./sleevecap";
|
||||
//import draftSleeve from "./sleeve";
|
||||
// backBlock: ".Back block"
|
||||
// frontBlock: ".Front block"
|
||||
// sleeveBlock: ".Sleeve block"
|
||||
// block: ".Block"
|
||||
// frontAndBackBlock: ".Front and back block"
|
||||
// frontRight: "Front right"
|
||||
// frontLeft: "Front left"
|
||||
// buttonPlacket: "Button placket."
|
||||
// buttonholePlacket: "Buttonhole placket."
|
||||
// yoke: "Yoke"
|
||||
// back: "Back"
|
||||
// sleeve: "Sleeve"
|
||||
// collarStand: "Collar stand"
|
||||
// collar: "Collar"
|
||||
// undercollar: "Undercollar"
|
||||
// sleevePlacketUnderlap: "Sleeve placket underlap"
|
||||
// sleevePlacketOverlap: "Sleeve placket overlap"
|
||||
// barrelCuff: "Barrel cuff"
|
||||
// frenchCuff: "French cuff"
|
||||
|
||||
// Constructor boilerplate
|
||||
const Simon = function(settings = false) {
|
||||
freesewing.Pattern.call(this, { version: version, ...config });
|
||||
this.with(pluginBundle);
|
||||
if (settings !== false) this.mergeSettings(settings);
|
||||
|
||||
return this;
|
||||
};
|
||||
|
||||
// Inheritance boilerplate
|
||||
Simon.prototype = Object.create(freesewing.Pattern.prototype);
|
||||
Simon.prototype.constructor = Simon;
|
||||
|
||||
// Attach per-part draft methods to prototype
|
||||
Simon.prototype.draftBase = function (part) {
|
||||
return new Brian(this.settings).draftBase(part);
|
||||
}
|
||||
Simon.prototype.draftFrontBase = function (part) {
|
||||
return new Brian(this.settings).draftFront(part);
|
||||
}
|
||||
Simon.prototype.draftBackBase = function (part) {
|
||||
return new Brian(this.settings).draftBack(part);
|
||||
}
|
||||
Simon.prototype.draftBack = draftBack;
|
||||
|
||||
|
||||
|
||||
//Brian.prototype.draftFront = draftFront;
|
||||
//Brian.prototype.draftSleevecap = draftSleevecap;
|
||||
//Brian.prototype.draftSleeve = draftSleeve;
|
||||
|
||||
export default Simon;
|
||||
18
packages/simon/src/shared.js
Normal file
18
packages/simon/src/shared.js
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
export const calculateReduction = function(part) {
|
||||
let { store, measurements, options } = part.shorthand();
|
||||
if(store.get('reduction') === true) return;
|
||||
|
||||
let chest = measurements.chestCircumference * (1+ options.chestEase);
|
||||
let waist = measurements.naturalWaist * (1+ options.waistEase);
|
||||
let hips = measurements.hipsCircumference * (1+ options.hipsEase);
|
||||
let waistReduction = chest - waist;
|
||||
let hipsReduction = chest - hips;
|
||||
|
||||
// If your waist > chest, this pattern is not going to work for you as-is.
|
||||
if (waistReduction < 0) waistReduction = 0;
|
||||
if (hipsReduction < 0) hipsReduction = 0;
|
||||
store.set("waistReduction", waistReduction);
|
||||
store.set("hipsReduction", hipsReduction);
|
||||
store.set("reduction", true);
|
||||
}
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue