VSinerva/freesewing
1
0
Fork 0
Code Activity

Merge branch 'bobgeorgethe3rd-develop' into develop

Browse source
This commit is contained in:
joostdecock 2021-08-30 20:54:26 +02:00
commit 1d00a777bc
5 changed files with 94 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
packages/holmes/config/index.js
View file

@ -6,22 +6,29 @@ export default {
name: 'holmes',
version,
design: 'Erica Alcusa Sáez',
code: 'Erica Alcusa Sáez',
code: ['Erica Alcusa Sáez', 'bobgeorgethe3rd'],
department: 'accessories',
type: 'pattern',
difficulty: 3,
optionGroups: {
style: ['lengthRatio', 'goreNumber', 'brimAngle', 'brimWidth'],
fit: ['headEase'],
style: ['lengthRatio', 'goreNumber', 'visorAngle', 'visorWidth','earLength','earWidth','buttonhole'],
advanced:['visorLength'],
},
measurements: ['head'],
dependencies: {},
inject: {},
hide: [],
parts: ['gore', 'brim', 'ear'],
parts: ['gore', 'visor', 'ear'],
options: {
headEase: { mm: 19, min: 0, max: 50 },
lengthRatio: { pct: 55, min: 40, max: 60 },
goreNumber: { count: 6, min: 4, max: 20 },
brimAngle: { deg: 45, min: 10, max: 90 },
brimWidth: { mm: 30, min: 5, max: 100 },
visorAngle: { deg: 45, min: 10, max: 90 },
visorWidth: { mm: 30, min: 5, max: 100 },
earLength: { pct: 100, min: 80, max: 150 },
earWidth: { pct: 100, min: 80, max: 150 },
visorLength: { pct: 100, min: 80, max: 150 },
buttonhole: {bool: false}
},
}

41
packages/holmes/src/ear.js
View file

@ -15,33 +15,43 @@ export default function (part) {
} = part.shorthand()
// Design pattern here
let headCircumference = measurements.head + options.headEase
let earFlapLength = ((options.lengthRatio * headCircumference) / 2)*options.earLength
let earFlapWidth = (headCircumference / 12)*options.earWidth
points.top = new Point(0, 0)
points.bottom = new Point(measurements.head / 12, (options.lengthRatio * measurements.head) / 2)
points.bottom = new Point(earFlapWidth, earFlapLength)
points.topC = points.top.shift(0, points.bottom.x)
points.bottomC = points.bottom.shift(90, points.bottom.y - points.bottom.x)
points.topCFlipped = points.topC.flipX()
points.bottomFlipped = points.bottom.flipX()
points.bottomCFlipped = points.bottomC.flipX()
paths.seam = new Path()
.move(points.top)
paths.seam = new Path()
.move(points.bottom)
.curve(points.bottomC, points.topC, points.top)
.curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped)
.line(points.bottom)
.curve(points.bottomC, points.topC, points.top)
.close()
paths.hem = new Path()
.move(points.bottomFlipped)
.line(points.bottom)
// Complete?
if (complete) {
macro('grainline', { from: points.top, to: new Point(0, points.bottom.y) })
points.logo = new Point(-0.5 * points.bottom.x, 0.75 * points.bottom.y)
snippets.logo = new Snippet('logo', points.logo).attr('data-scale', 0.7)
points.title = new Point(0.3 * points.bottom.x, 0.75 * points.bottom.y)
macro('title', { at: points.title, nr: 3, title: 'ear', scale: 0.5 })
macro('title', { at: points.title, nr: 3, title: 'ear flap', scale: 0.5 })
macro('miniscale', { at: new Point(0, points.bottom.y * 0.3) })
if (options.buttonhole){
let buttonholeDistance = (options.lengthRatio * headCircumference) / 2
points.buttonhole = new Point (points.top.x, points.bottom.y - buttonholeDistance)
snippets.buttonhole = new Snippet('buttonhole-start', points.buttonhole).attr('data-scale', 2)
}
if (sa) {
paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa')
paths.sa = paths.seam.offset(sa)
.join(paths.hem.offset(sa*2))
.attr('class', 'fabric sa')
.close()
}
// Paperless?
@ -56,6 +66,13 @@ export default function (part) {
to: points.top,
x: points.bottomFlipped.x - 15 - sa,
})
if (options.buttonhole){
macro('vd', {
from: points.bottom,
to: points.buttonhole,
x: points.bottom.x + 15 + sa,
})
}
}
}
return part

23
packages/holmes/src/gore.js
View file

@ -5,7 +5,8 @@ export default function (part) {
// Design pattern here
//Radius of the head
let headRadius = measurements.head / 2 / Math.PI
let headCircumference = measurements.head + options.headEase
let headRadius = headCircumference / 2 / Math.PI
points.p0 = new Point(0, 0)
@ -13,7 +14,7 @@ export default function (part) {
from: points.p0,
radius: headRadius,
goreNumber: options.goreNumber,
extraLength: ((options.lengthRatio - 0.5) * measurements.head) / 2,
extraLength: ((options.lengthRatio - 0.5) * headCircumference) / 2,
prefix: 'gore_',
render: true,
})
@ -21,7 +22,7 @@ export default function (part) {
// Complete?
if (complete) {
points.title = new Point(points.gore_p1.x / 10, points.gore_p2.y / 1.8)
macro('title', { at: points.title, nr: 1, title: 'gore', scale: 0.5 })
macro('title', { at: points.title, nr: 1, title: 'crown', scale: 0.5 })
macro('cutonfold', {
from: points.p0,
@ -31,18 +32,24 @@ export default function (part) {
})
if (sa) {
paths.saBase = new Path()
paths.saCurve = new Path()
.move(points.gore_p1)
.curve(points.gore_Cp1, points.gore_Cp2, points.gore_p2)
.line(points.gore_p3)
.line(points.p0)
.offset(sa)
.setRender(false)
points.sa1 = new Point(points.gore_p3.x - (sa*2), points.gore_p3.y - sa)
paths.saBase = new Path()
.move(points.gore_p3)
.line(points.p0)
.offset(sa*2)
.setRender(false)
paths.sa = new Path()
.move(points.gore_p1)
.line(points.gore_p1.shift(0, sa))
.line(paths.saBase.start())
.join(paths.saBase)
.line(paths.saCurve.start())
.join(paths.saCurve)
.line(points.sa1)
.join(paths.saBase)
.line(points.p0)
.attr('class', 'fabric sa')
}

4
packages/holmes/src/index.js
View file

@ -4,7 +4,7 @@ import gorePlugin from '@freesewing/plugin-gore'
import config from '../config'
import draftGore from './gore'
import draftBrim from './brim'
import draftVisor from './visor'
import draftEar from './ear'
// Create new design
@ -12,7 +12,7 @@ const Pattern = new freesewing.Design(config, [plugins, gorePlugin])
// Attach the draft methods to the prototype
Pattern.prototype.draftGore = draftGore
Pattern.prototype.draftBrim = draftBrim
Pattern.prototype.draftVisor = draftVisor
Pattern.prototype.draftEar = draftEar
export default Pattern

49
packages/holmes/src/brim.js → packages/holmes/src/visor.js
View file

@ -2,30 +2,36 @@ export default function (part) {
let { Point, points, Path, paths, measurements, options, complete, sa, paperless, macro } =
part.shorthand()
let headRadius = measurements.head / 2 / Math.PI
let brimRadius = headRadius / Math.sin((options.brimAngle * Math.PI) / 180)
let sectorAngle = Math.PI / 3
let brimSectorAngle = (sectorAngle * headRadius) / brimRadius
let headCircumference = measurements.head + options.headEase
let headRadius = headCircumference / 2 / Math.PI
let visorRadius = (headRadius / Math.sin((options.visorAngle * Math.PI) / 180))
let sectorAngle = (Math.PI / 3)*options.visorLength
let visorSectorAngle = (sectorAngle * headRadius) / visorRadius
let cpDistance =
((4 / 3) * brimRadius * (1 - Math.cos(brimSectorAngle / 2))) / Math.sin(brimSectorAngle / 2)
((4 / 3) * visorRadius * (1 - Math.cos(visorSectorAngle / 2))) / Math.sin(visorSectorAngle / 2)
points.origin = new Point(0, 0)
points.in1 = new Point(0, 0)
points.in2 = points.in1.shift(
(90 / Math.PI) * brimSectorAngle,
2 * brimRadius * Math.sin(brimSectorAngle / 2)
((90 / Math.PI) * visorSectorAngle),
2 * visorRadius * Math.sin(visorSectorAngle / 2)
)
//test circle
//points.circleCentre = points.in1.shift(90,headRadius)
//.attr("data-circle",headRadius)
//points.circle60 = points.circleCentre.shift(-30,headRadius)
//
points.in1C = points.in1.shift(0, cpDistance)
points.in2C = points.in2.shift(180 + (180 / Math.PI) * brimSectorAngle, cpDistance)
points.in2C = points.in2.shift(180 + (180 / Math.PI) * visorSectorAngle, cpDistance)
points.in1CFlipped = points.in1C.flipX()
points.in2Flipped = points.in2.flipX()
points.in2CFlipped = points.in2C.flipX()
points.ex1 = points.in1.shift(-90, options.brimWidth)
points.ex1 = points.in1.shift(-90, options.visorWidth)
points.ex1C = points.ex1.shift(0, 0.5 * points.in2.x)
points.ex2C = points.in2.shift(
-90,
(points.ex1.y - points.in2.y) * (2 / (1 + Math.exp(-options.brimWidth / 15)) - 1)
(points.ex1.y - points.in2.y) * (2 / (1 + Math.exp(-options.visorWidth / 15)) - 1)
)
points.ex1CFlipped = points.ex1C.flipX()
points.ex2CFlipped = points.ex2C.flipX()
@ -37,16 +43,33 @@ export default function (part) {
.curve(points.ex2C, points.ex1C, points.ex1)
.curve(points.ex1CFlipped, points.ex2CFlipped, points.in2Flipped)
.close()
// Complete?
if (complete) {
macro('grainline', { from: points.in1, to: points.ex1 })
macro('title', { at: points.ex1.shift(45, 20), nr: 2, title: 'brim', scale: 0.4 })
macro('title', { at: points.ex1.shift(45, 20), nr: 2, title: 'visor', scale: 0.4 })
if (sa) {
paths.sa = paths.seam.offset(sa * -1).attr('class', 'fabric sa')
paths.saInner = new Path ()
.move(points.in2Flipped)
.curve(points.in2CFlipped, points.in1CFlipped, points.in1)
.curve(points.in1C, points.in2C, points.in2)
.offset(sa*-2)
.attr('class', 'fabric sa')
points.sa1 = new Point(points.in2Flipped.x-sa, paths.saInner.start().y)
points.sa2 = new Point(points.in2.x+sa, paths.saInner.start().y)
paths.sa = new Path()
.move(points.in2)
.curve(points.ex2C, points.ex1C, points.ex1)
.curve(points.ex1CFlipped, points.ex2CFlipped, points.in2Flipped)
.offset(sa*-1)
.line(points.sa1)
.join(paths .saInner)
.line(points.sa2)
.close()
.attr('class', 'fabric sa')
}
// Paperless?
if (paperless) {
macro('hd', {