1
0
Fork 0

chore: Linter run

This commit is contained in:
Joost De Cock 2021-08-30 11:40:16 +02:00
parent e693c7712e
commit ef3bd03e2c
183 changed files with 919 additions and 1838 deletions

View file

@ -226,7 +226,7 @@ export default {
// s3 is short for Shoulder Seam Shift
s3Collar: { pct: 0, min: -100, max: 100 },
s3Armhole: { pct: 0, min: -100, max: 100 },
ffsa: {pct: 150, min: 100, max:200 },
ffsa: { pct: 150, min: 100, max: 200 },
sleevecapEase: { pct: 0, min: 0, max: 3 },
sleevecapTopFactorX: { pct: 50, min: 25, max: 75 },
sleevecapTopFactorY: { pct: 100, min: 35, max: 165 },

View file

@ -12,23 +12,18 @@ const output = [
format: 'cjs',
sourcemap: true,
exports: rollup.exports,
}
},
]
if (typeof module !== 'undefined')
output.push({
banner,
file: module,
format: 'es',
sourcemap: true
sourcemap: true,
})
export default {
input: 'src/index.js',
output,
plugins: [
peerDepsExternal(),
resolve({ modulesOnly: true }),
commonjs(),
json(),
]
plugins: [peerDepsExternal(), resolve({ modulesOnly: true }), commonjs(), json()],
}

View file

@ -77,23 +77,26 @@ export default (part) => {
points.hipsCp2 = points.hips.shift(90, points.waist.dy(points.hips) / 4)
// Cut off at yoke
const neverAboveCbNeck = () => (points.cbNeck.dy(points.cbYoke) < 10) ? (points.cbYoke.y = points.cbNeck.y + 10) : null
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) {
} 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))
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)
const [back, yoke] = paths.backArmhole.split(points.armholeYokeSplit)
paths.backArmholeYoke = yoke.setRender(false)
paths.backArmholeBack = back.setRender(false)
}
@ -103,14 +106,18 @@ 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)
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.roundBack > 0) {
points.cbTop = points.cbYoke.shift(90, points.armholePitch.x * options.roundBack)
points.cbTopCp1 = points.cbTop.shift(0, points.armholePitch.x * 0.5)
paths.roundedBack = new Path().move(points.armholeYokeSplit)._curve(points.cbTopCp1, points.cbTop).line(points.cbYoke)
paths.roundedBack = new Path()
.move(points.armholeYokeSplit)
._curve(points.cbTopCp1, points.cbTop)
.line(points.cbYoke)
}
// Box pleat
@ -133,12 +140,11 @@ export default (part) => {
'armholeHollowCp1',
'armholeCp2',
'armhole',
'armholeYokeSplit'
'armholeYokeSplit',
])
points[p] = points[p].shift(0, options.boxPleatFold * 2)
}
// Draft hem
switch (options.hemStyle) {
case 'baseball':

View file

@ -1,17 +1,6 @@
export default (part) => {
let {
measurements,
utils,
sa,
Point,
points,
Path,
paths,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { measurements, utils, sa, Point, points, Path, paths, complete, paperless, macro, options } =
part.shorthand()
const draft = function (tweak = 1) {
let length = measurements.neck * (1 + options.collarEase - options.collarGap) * tweak

View file

@ -1,19 +1,8 @@
import { calculateReduction } from './shared'
export default (part) => {
let {
store,
measurements,
sa,
Point,
points,
Path,
paths,
complete,
macro,
snippets,
options,
} = part.shorthand()
let { store, measurements, sa, Point, points, Path, paths, complete, macro, snippets, options } =
part.shorthand()
// Clean up
for (let i in paths) {

View file

@ -1,18 +1,8 @@
import { addButtonHoles } from './shared'
export default (part) => {
let {
sa,
Point,
points,
Path,
paths,
snippets,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { sa, Point, points, Path, paths, snippets, complete, paperless, macro, options } =
part.shorthand()
let fold = options.buttonholePlacketFoldWidth
let width = options.buttonholePlacketWidth

View file

@ -1,17 +1,6 @@
export default (part) => {
let {
utils,
sa,
Point,
points,
Path,
paths,
snippets,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { utils, sa, Point, points, Path, paths, snippets, complete, paperless, macro, options } =
part.shorthand()
let fold = options.buttonholePlacketFoldWidth
points.neckEdge = utils.lineIntersectsCurve(

View file

@ -1,18 +1,8 @@
import { addButtons } from './shared'
export default (part) => {
let {
utils,
sa,
Point,
points,
Path,
paths,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { utils, sa, Point, points, Path, paths, complete, paperless, macro, options } =
part.shorthand()
let width = options.buttonPlacketWidth
points.placketTopIn = utils.lineIntersectsCurve(

View file

@ -1,16 +1,6 @@
export default (part) => {
let {
snippets,
utils,
sa,
Point,
points,
paths,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { snippets, utils, sa, Point, points, paths, complete, paperless, macro, options } =
part.shorthand()
let width = options.buttonPlacketWidth
points.placketTopIn = utils.lineIntersectsCurve(

View file

@ -1,36 +1,21 @@
export default (part) => {
let {
sa,
Point,
points,
Path,
paths,
Snippet,
snippets,
complete,
paperless,
macro,
options,
} = part.shorthand()
let { sa, Point, points, Path, paths, Snippet, snippets, complete, paperless, macro, options } =
part.shorthand()
for (let id in paths) {
if (['backCollar', 'backArmhole', 'backArmholeYoke'].indexOf(id) === -1) delete part.paths[id]
}
// Paths
paths.saBase = new Path()
.move(points.cbYoke)
.line(points.armholeYokeSplit)
paths.saBase = new Path().move(points.cbYoke).line(points.armholeYokeSplit)
if (options.yokeHeight > 0) paths.saBase = paths.saBase.join(paths.backArmholeYoke)
paths.saBase = paths.saBase
.line(points.s3CollarSplit)
.join(paths.backCollar)
paths.saBase = paths.saBase.line(points.s3CollarSplit).join(paths.backCollar)
if (options.splitYoke) paths.saBase = paths.saBase.line(points.cbYoke).close()
else {
macro('mirror', {
mirror: [points.cbNeck,points.cbYoke],
mirror: [points.cbNeck, points.cbYoke],
paths: [paths.saBase],
clone: true
clone: true,
})
paths.saBase = paths.saBase.join(paths.mirroredSaBase.reverse())
paths.mirroredSaBase.setRender(false)