From c5138aad991d4e1b46ac84cbad0db5f93b8e62ca Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Sun, 18 Sep 2022 19:14:25 +0200 Subject: [PATCH] fix: No more setRender() use hide() unhide() instead --- designs/bee/src/cup.mjs | 10 +++--- designs/bella/src/back.mjs | 2 +- designs/bella/src/front-side-dart.mjs | 2 +- designs/benjamin/src/base.mjs | 4 +-- designs/benjamin/src/bow1.mjs | 4 +-- designs/benjamin/src/bow2.mjs | 4 +-- designs/benjamin/src/bow3.mjs | 4 +-- designs/bruce/src/inset.mjs | 4 +-- designs/cathrin/src/panel1ab.mjs | 4 +-- designs/charlie/src/back-pocket-facing.mjs | 4 +-- designs/charlie/src/back.mjs | 2 +- designs/charlie/src/fly-extension.mjs | 9 ++--- designs/charlie/src/waistband-curved.mjs | 6 ++-- designs/charlie/src/waistband.mjs | 4 +-- designs/cornelius/src/front.mjs | 19 +++------- designs/cornelius/src/frontpoints.mjs | 4 +-- designs/cornelius/src/pocket.mjs | 8 ++--- designs/cornelius/src/pocketfacing.mjs | 10 +++--- designs/hi/src/belly.mjs | 6 ++-- designs/hi/src/body.mjs | 4 +-- designs/holmes/src/ear.mjs | 4 +-- designs/holmes/src/visor.mjs | 4 +-- designs/lunetius/src/lacerna.mjs | 8 ++--- designs/noble/src/backoutside.mjs | 2 +- designs/noble/src/frontoutside.mjs | 6 ++-- designs/octoplushy/src/arm.mjs | 4 +-- designs/octoplushy/src/eye.mjs | 4 +-- designs/octoplushy/src/head.mjs | 40 ++++++++-------------- designs/penelope/src/back.mjs | 8 ++--- designs/penelope/src/shape.mjs | 16 ++++----- designs/penelope/src/utils.mjs | 6 ++-- designs/teagan/src/back.mjs | 6 ++-- designs/teagan/src/sleeve.mjs | 4 +-- designs/tiberius/src/tunica.mjs | 12 +++---- designs/ursula/src/back.mjs | 6 ++-- designs/ursula/src/front.mjs | 4 +-- designs/walburga/src/base.mjs | 6 ++-- designs/walburga/src/front.mjs | 8 ++--- designs/waralee/src/facings.mjs | 4 +-- designs/waralee/src/waistband.mjs | 2 +- designs/yuri/src/gusset.mjs | 2 +- 41 files changed, 117 insertions(+), 153 deletions(-) diff --git a/designs/bee/src/cup.mjs b/designs/bee/src/cup.mjs index a39407f835a..6736457d1ea 100644 --- a/designs/bee/src/cup.mjs +++ b/designs/bee/src/cup.mjs @@ -168,7 +168,7 @@ export const cup = { paths.frontCurve = new Path() .move(points.topLeft) .curve_(points.frontCurveControl, points.lefti) - .setRender(false) + .hide() points.frontNotch = paths.frontCurve.shiftFractionAlong(0.5) snippets.frontNotch = new Snippet('notch', points.frontNotch) snippets.lefti = new Snippet('notch', points.lefti) @@ -363,7 +363,7 @@ export const cup = { .move(points.lefti) .curve_(points.leftControlOffset, points.middleDart) .curve_(points.rightControlOffset, points.rightiOffset) - .setRender(false) + .hide() paths.dart = new Path() .move( points.bustA.shiftOutwards(points.leftDart, points.topRight.dist(points.rightiOffset)) @@ -372,7 +372,7 @@ export const cup = { .line( points.bustA.shiftOutwards(points.rightDart, points.topRight.dist(points.rightiOffset)) ) - .setRender(false) + .hide() for (let p of paths.curve.intersects(paths.dart)) { points.rightDarti = points.bustA.shiftFractionTowards(p, 1) } @@ -381,11 +381,11 @@ export const cup = { } let leftCurve = paths.curve.reverse().split(points.leftDarti) for (let i in leftCurve) { - paths.leftCurve = leftCurve[i].setRender(false) + paths.leftCurve = leftCurve[i].hide() } let rightCurve = paths.curve.split(points.rightDarti) for (let i in rightCurve) { - paths.rightCurve = rightCurve[i].setRender(false) + paths.rightCurve = rightCurve[i].hide() } store.set('gatherLength', paths.leftCurve.length() + paths.rightCurve.length()) } diff --git a/designs/bella/src/back.mjs b/designs/bella/src/back.mjs index 58b2597df71..adb64cd9590 100644 --- a/designs/bella/src/back.mjs +++ b/designs/bella/src/back.mjs @@ -251,7 +251,7 @@ export const back = { .line(points.hps) ._curve(points.cbNeckCp1, points.cbNeck) .close() - .setRender(false) + .hide() if (complete) { points.titleAnchor = new Point(points.hps.x, points.armholePitchCp2.y) diff --git a/designs/bella/src/front-side-dart.mjs b/designs/bella/src/front-side-dart.mjs index d737f5c1fb1..c7052a5b744 100644 --- a/designs/bella/src/front-side-dart.mjs +++ b/designs/bella/src/front-side-dart.mjs @@ -200,7 +200,7 @@ export const frontSideDart = { .curve_(points.armholePitchCp2, points.shoulder) .line(points.hps) .curve(points.hpsCp2, points.cfNeckCp1, points.cfNeck) - .setRender(false) + .hide() if (complete) { points.titleAnchor = new Point(points.armholePitch.x / 2, points.armholePitchCp2.y) diff --git a/designs/benjamin/src/base.mjs b/designs/benjamin/src/base.mjs index 084a1798204..c011f5ec0be 100644 --- a/designs/benjamin/src/base.mjs +++ b/designs/benjamin/src/base.mjs @@ -122,7 +122,7 @@ function draftBenjaminBase({ .curve(points.knotTopCp2, points.tip1TopCp1, points.tip1Top) .curve(points.tip1TopCp2, points.transitionTopRightCp1, points.transitionTopRight) .line(points.bandTopRight) - .setRender(false) + .hide() } else { paths.bow = new Path() .move(points.bandBottomRight) @@ -132,7 +132,7 @@ function draftBenjaminBase({ .line(points.tip2Top) .line(points.transitionTopRight) .line(points.bandTopRight) - .setRender(false) + .hide() } // Complete? diff --git a/designs/benjamin/src/bow1.mjs b/designs/benjamin/src/bow1.mjs index 9e3854878e4..d812215a2d4 100644 --- a/designs/benjamin/src/bow1.mjs +++ b/designs/benjamin/src/bow1.mjs @@ -29,7 +29,7 @@ function draftBenjaminBow1({ .line(points.bandTopLeft) .close() .attr('class', 'fabric') - .setRender(true) + .unhide() if (complete) { // Paperless? @@ -41,7 +41,7 @@ function draftBenjaminBow1({ }) } if (sa) { - paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').unhide() } macro('title', { at: points.titleAnchor, diff --git a/designs/benjamin/src/bow2.mjs b/designs/benjamin/src/bow2.mjs index c520e6b498e..ca9db437d87 100644 --- a/designs/benjamin/src/bow2.mjs +++ b/designs/benjamin/src/bow2.mjs @@ -32,7 +32,7 @@ function draftBenjaminBow2({ .line(points.bandTopLeft) .close() .attr('class', 'fabric') - .setRender(true) + .unhide() if (complete) { // Paperless? @@ -44,7 +44,7 @@ function draftBenjaminBow2({ }) } if (sa) { - paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').unhide() } macro('title', { at: points.titleAnchor, diff --git a/designs/benjamin/src/bow3.mjs b/designs/benjamin/src/bow3.mjs index e25043eb46f..0587a97eee5 100644 --- a/designs/benjamin/src/bow3.mjs +++ b/designs/benjamin/src/bow3.mjs @@ -32,7 +32,7 @@ function draftBenjaminBow3({ .line(points.bandTopLeft) .close() .attr('class', 'fabric') - .setRender(true) + .unhide() if (complete) { // Paperless? @@ -44,7 +44,7 @@ function draftBenjaminBow3({ }) } if (sa) { - paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').setRender(true) + paths.sa = paths.seam.offset(sa).attr('class', 'fabric sa').unhide() } macro('title', { at: points.titleAnchor, diff --git a/designs/bruce/src/inset.mjs b/designs/bruce/src/inset.mjs index 49d26fe1584..41a8dd7ee19 100644 --- a/designs/bruce/src/inset.mjs +++ b/designs/bruce/src/inset.mjs @@ -45,8 +45,8 @@ function draftBruceInset({ .line(points.tip) .curve(points.tipCpBottom, points.tipCpTop, points.topLeft) .line(points.bottomLeft) - .setRender(false) - paths.hemBase = new Path().move(points.bottomLeft).line(points.bottomRight).setRender(false) + .hide() + paths.hemBase = new Path().move(points.bottomLeft).line(points.bottomRight).hide() paths.seam = paths.saBase.join(paths.hemBase).close().attr('class', 'fabric') // Complete pattern? diff --git a/designs/cathrin/src/panel1ab.mjs b/designs/cathrin/src/panel1ab.mjs index 3d7f0d2fa05..64c4f567214 100644 --- a/designs/cathrin/src/panel1ab.mjs +++ b/designs/cathrin/src/panel1ab.mjs @@ -26,8 +26,8 @@ export function draftPanel1ab({ .join(bottom.split(points.bottomABsplit)[0]) .line(points.topABsplit) .join(top.split(points.topABsplit)[1]) - .setRender(false) - paths.panel1a = paths.panel1a_nonfold.clone().close().attr('class', 'fabric').setRender(true) + .hide() + paths.panel1a = paths.panel1a_nonfold.clone().close().attr('class', 'fabric').unhide() paths.panel1b = bottom .split(points.bottomABsplit)[1] .curve(points.hipsGap1Cp, points.waistGap1LeftCp1, points.waistGap1Left) diff --git a/designs/charlie/src/back-pocket-facing.mjs b/designs/charlie/src/back-pocket-facing.mjs index 971ee7a496f..fe36d06e114 100644 --- a/designs/charlie/src/back-pocket-facing.mjs +++ b/designs/charlie/src/back-pocket-facing.mjs @@ -26,8 +26,8 @@ function draftCharlieBackPocketFacing({ .line(points.waistbandLeft) ._curve(points.cpLeft, points.curveStartLeft) .line(points.bottomLeft) - .setRender(false) - paths.seam = paths.saBase.clone().close().setRender(true).attr('class', 'fabric') + .hide() + paths.seam = paths.saBase.clone().close().unhide().attr('class', 'fabric') if (complete) { paths.opening = new Path() diff --git a/designs/charlie/src/back.mjs b/designs/charlie/src/back.mjs index dc78092edda..a79f33970ec 100644 --- a/designs/charlie/src/back.mjs +++ b/designs/charlie/src/back.mjs @@ -136,7 +136,7 @@ function draftCharlieBack({ .insop('dart', new Path().line(points.pocketCenter)) .close() .attr('class', 'fabric') - paths.saBase.setRender(false) + paths.saBase.hide() if (complete) { paths.pocketLine = new Path() diff --git a/designs/charlie/src/fly-extension.mjs b/designs/charlie/src/fly-extension.mjs index 24bfd169592..b45f7ea5005 100644 --- a/designs/charlie/src/fly-extension.mjs +++ b/designs/charlie/src/fly-extension.mjs @@ -26,13 +26,8 @@ function draftCharlieFlyExtension({ points, paths, Path, complete, macro, sa, pa ) .line(points.styleWaistIn) .line(points.flyTop) - .setRender(false) - paths.seam = paths.saBase - .clone() - .line(points.flyCorner) - .close() - .setRender(true) - .attr('class', 'fabric') + .hide() + paths.seam = paths.saBase.clone().line(points.flyCorner).close().hide().attr('class', 'fabric') if (complete) { macro('cutonfold', { diff --git a/designs/charlie/src/waistband-curved.mjs b/designs/charlie/src/waistband-curved.mjs index 207634cec6b..0c907a715ad 100644 --- a/designs/charlie/src/waistband-curved.mjs +++ b/designs/charlie/src/waistband-curved.mjs @@ -66,7 +66,7 @@ function draftCharlieWaistbandCurved({ paths.waistbandTop = new Path() .move(points.cfRightTop) .curve(points.cfRightTopCp, points.cfLeftTopCp, points.cfLeftTop) - .setRender(false) + .hide() paths.waistbandBottom = new Path() .move(points.cfRightBottom) @@ -87,8 +87,8 @@ function draftCharlieWaistbandCurved({ .curve(points.cfRightTopCp, points.cfLeftTopCp, points.cfLeftTop) .line(points.cfLeftBottom) .close() - .setRender(false) - paths.seam = paths.saBase.clone().attr('class', 'fabric').setRender(true) + .hide() + paths.seam = paths.saBase.clone().attr('class', 'fabric').unhide() if (complete) { log.info(`Top of waistband: ${units(paths.waistbandTop.length())}`) diff --git a/designs/charlie/src/waistband.mjs b/designs/charlie/src/waistband.mjs index 876b57f734f..9cf8268322b 100644 --- a/designs/charlie/src/waistband.mjs +++ b/designs/charlie/src/waistband.mjs @@ -49,8 +49,8 @@ function draftCharlieWaistband({ .line(points.topRight) .line(points.bottomRight) .line(points.bottomLeft) - .setRender(false) - paths.seam = paths.saBase.clone().close().attr('class', 'fabric').setRender(true) + .hide() + paths.seam = paths.saBase.clone().close().attr('class', 'fabric').unhide() if (complete) { macro('sprinkle', { diff --git a/designs/cornelius/src/front.mjs b/designs/cornelius/src/front.mjs index 2c8dd0f0438..eb723221176 100644 --- a/designs/cornelius/src/front.mjs +++ b/designs/cornelius/src/front.mjs @@ -54,17 +54,14 @@ function draftCorneliusFront({ .line(points.flyTop) .line(points.flyBottom) .curve(points.pFBcpZ, points.pZcpFB, points.pZ) - .setRender(false) + .hide() paths.flyFold = new Path().move(points.pW).line(points.pZ).attr('class', 'fabric dashed') store.set('flyLength', paths.flyFold.length()) store.set('frontWaistLength', paths.waistSeam.line(points.flyTop).length()) - paths.crotchSeam = new Path() - .move(points.pZ) - .curve(points.pZcpR, points.pRcpZ, points.pR) - .setRender(false) + paths.crotchSeam = new Path().move(points.pZ).curve(points.pZcpR, points.pRcpZ, points.pR).hide() points.pRcpK = points.pR .shiftFractionTowards(points.pF, options.pctRtoKin) @@ -73,20 +70,14 @@ function draftCorneliusFront({ .shiftFractionTowards(points.pH, -1 * (options.pctKtoRout + options.fullness)) .shiftFractionTowards(points.pR, options.pctKtoRup) - paths.insideSeam = new Path() - .move(points.pR) - .curve(points.pRcpK, points.pKcpR, points.pK) - .setRender(false) + paths.insideSeam = new Path().move(points.pR).curve(points.pRcpK, points.pKcpR, points.pK).hide() store.set('insideSeam', paths.insideSeam.length()) let tempP = points.pH.shift(270, halfInch * 1.5) points.pKcpH = points.pK.shiftFractionTowards(tempP, options.pctKtoH) points.pJcpH = points.pJ.shiftFractionTowards(tempP, options.pctKtoH) - paths.legSeam = new Path() - .move(points.pK) - .curve(points.pKcpH, points.pJcpH, points.pJ) - .setRender(false) + paths.legSeam = new Path().move(points.pK).curve(points.pKcpH, points.pJcpH, points.pJ).hide() store.set('frontLegSeam', paths.legSeam.length()) @@ -103,7 +94,7 @@ function draftCorneliusFront({ points.pocketWaist = paths.waistSeam.shiftAlong(waist / 2 / 4.5) points.pocketSide = paths.sideSeam.shiftAlong(paths.sideSeam.length() - (waist / 2 / 4.5) * 3.5) - paths.pocketSeam = new Path().move(points.pocketSide).line(points.pocketWaist).setRender(false) + paths.pocketSeam = new Path().move(points.pocketSide).line(points.pocketWaist).hide() paths.waistSeam = paths.waistSeam.split(points.pocketWaist)[1] paths.sideSeam = paths.sideSeam.split(points.pocketSide)[0] diff --git a/designs/cornelius/src/frontpoints.mjs b/designs/cornelius/src/frontpoints.mjs index b1979fd2323..64550b80680 100644 --- a/designs/cornelius/src/frontpoints.mjs +++ b/designs/cornelius/src/frontpoints.mjs @@ -86,9 +86,9 @@ function draftCorneliusFrontpoints({ .move(points.pJ) .curve(points.pJcpA, points.pAextraCPj, points.pAextra) .curve(points.pAextraCPu, points.pUcpA, points.pU) - .setRender(false) + .hide() - paths.waistSeam = new Path().move(points.pU).line(points.pD).line(points.pW).setRender(false) + paths.waistSeam = new Path().move(points.pU).line(points.pD).line(points.pW).hide() points.pocketWaist = paths.waistSeam.shiftAlong(waist / 2 / 4.5) points.pocketFacingTL = paths.waistSeam.shiftAlong(waist / 2 / 4.5 + halfInch * 3) diff --git a/designs/cornelius/src/pocket.mjs b/designs/cornelius/src/pocket.mjs index e9cba9ffd3a..2dad5a77ca9 100644 --- a/designs/cornelius/src/pocket.mjs +++ b/designs/cornelius/src/pocket.mjs @@ -15,9 +15,9 @@ function draftCorneliusPocket({ }) { let halfInch = store.get('halfInch') - paths.waistSeam = paths.waistSeam.split(points.pocketFacingTL)[0].setRender(false) + paths.waistSeam = paths.waistSeam.split(points.pocketFacingTL)[0].hide() - paths.sideSeam = paths.sideSeam.split(points.pocketFacingBR)[1].setRender(false) + paths.sideSeam = paths.sideSeam.split(points.pocketFacingBR)[1].hide() points.brCPtl = points.pocketFacingBR.shift( points.pocketFacingBR.angle(points.pocketSide) + 90, @@ -31,7 +31,7 @@ function draftCorneliusPocket({ paths.facingInside = new Path() .move(points.pocketFacingTL) .curve(points.tlCPbr, points.brCPtl, points.pocketFacingBR) - .setRender(false) + .hide() paths.pocketFold = new Path() .move(points.pocketTL) @@ -63,7 +63,7 @@ function draftCorneliusPocket({ .join(paths.pocketBottom) .join(paths.sideSeam) .close() - .setRender(true) + .hide() .attr('class', 'fabric') if (complete) { diff --git a/designs/cornelius/src/pocketfacing.mjs b/designs/cornelius/src/pocketfacing.mjs index d1820e3536d..a83fd70cef9 100644 --- a/designs/cornelius/src/pocketfacing.mjs +++ b/designs/cornelius/src/pocketfacing.mjs @@ -17,7 +17,7 @@ function draftCorneliusPocketFacing({ let halfInch = store.get('halfInch') let waist = store.get('waist') - paths.waistSeam = paths.waistSeam.split(points.pocketFacingTL)[0].setRender(false) + paths.waistSeam = paths.waistSeam.split(points.pocketFacingTL)[0].hide() // Adding sa to this point so it allows for the pocket seam to be finished without the facing being included points.pocketFacingBR = paths.sideSeam.shiftAlong( @@ -29,8 +29,8 @@ function draftCorneliusPocketFacing({ paths.sideSeam = new Path() .move(points.pAextra) .curve(points.pAextraCPu, points.pUcpA, points.pU) - .setRender(false) - else paths.sideSeam = paths.sideSeam.split(points.pocketFacingBR)[1].setRender(false) + .hide() + else paths.sideSeam = paths.sideSeam.split(points.pocketFacingBR)[1].hide() points.brCPtl = points.pocketFacingBR.shift( points.pocketFacingBR.angle(points.pocketSide) + 90, @@ -44,13 +44,13 @@ function draftCorneliusPocketFacing({ paths.facingInside = new Path() .move(points.pocketFacingTL) .curve(points.tlCPbr, points.brCPtl, points.pocketFacingBR) - .setRender(false) + .hide() paths.seam = paths.waistSeam .join(paths.facingInside) .join(paths.sideSeam) .close() - .setRender(true) + .hide() .attr('class', 'fabric') if (complete) { diff --git a/designs/hi/src/belly.mjs b/designs/hi/src/belly.mjs index df231af2ffe..7ebdee35bec 100644 --- a/designs/hi/src/belly.mjs +++ b/designs/hi/src/belly.mjs @@ -145,13 +145,13 @@ function draftHiBelly({ .curve(points.belly04cp2, points.belly03cp1, points.belly03) .curve(points.belly03cp2, points.belly02cp1, points.belly02) .curve(points.belly02cp2, points.belly01cp1, points.belly01) - .setRender(false) + .hide() paths.bottom = new Path() .move(points.belly09) .curve(points.belly09cp2, points.belly08cp1, points.belly08) .curve(points.belly08cp2, points.belly07cp1, points.belly07) .curve(points.belly07cp2, points.belly06cp1, points.belly06) - .setRender(false) + .hide() paths.seam = new Path() .move(points.belly01) .curve(points.belly01cp2, points.belly10cp1, points.belly10) @@ -161,7 +161,7 @@ function draftHiBelly({ .curve(points.belly05cp2, points.belly04cp1, points.belly04) .join(paths.top) .close() - .setRender(true) + .unhide() store.set( 'bellyFinLength', diff --git a/designs/hi/src/body.mjs b/designs/hi/src/body.mjs index 2fc70bd067a..da8b19b5be6 100644 --- a/designs/hi/src/body.mjs +++ b/designs/hi/src/body.mjs @@ -401,7 +401,7 @@ function draftHiBody({ .curve(points.body17cp1, points.body18cp2, points.body18) .curve(points.body18cp1, points.body19cp2, points.body19) .curve(points.body19cp1, points.body01cp2, points.body01) - .setRender(false) + .hide() paths.seam = new Path() .move(points.body01) @@ -409,7 +409,7 @@ function draftHiBody({ .curve(points.body02cp1, points.body03cp2, points.body03) .join(paths.allButDart) .close() - .setRender(true) + .hide() let gillPath = new Path() .move(points.body17) diff --git a/designs/holmes/src/ear.mjs b/designs/holmes/src/ear.mjs index 233d761c728..08ece73e794 100644 --- a/designs/holmes/src/ear.mjs +++ b/designs/holmes/src/ear.mjs @@ -31,8 +31,8 @@ function draftHolmesEar({ .move(points.bottom) .curve(points.bottomC, points.topC, points.top) .curve(points.topCFlipped, points.bottomCFlipped, points.bottomFlipped) - .setRender(false) - paths.hemBase = new Path().move(points.bottomFlipped).line(points.bottom).setRender(false) + .hide() + paths.hemBase = new Path().move(points.bottomFlipped).line(points.bottom).hide() paths.seam = paths.saBase.join(paths.hemBase).close() // Complete? if (complete) { diff --git a/designs/holmes/src/visor.mjs b/designs/holmes/src/visor.mjs index e544708428f..f4fdc2629e0 100644 --- a/designs/holmes/src/visor.mjs +++ b/designs/holmes/src/visor.mjs @@ -53,13 +53,13 @@ function draftHolmesVisor({ .move(points.in2) .curve(points.in2C, points.in1C, points.in1) .curve(points.in1CFlipped, points.in2CFlipped, points.in2Flipped) - .setRender(false) + .hide() paths.saOuter = new Path() .move(points.in2Flipped) .curve(points.ex2CFlipped, points.ex1CFlipped, points.ex1) .curve(points.ex1C, points.ex2C, points.in2) - .setRender(false) + .hide() paths.seam = paths.saOuter.join(paths.saInner).close() // Complete? diff --git a/designs/lunetius/src/lacerna.mjs b/designs/lunetius/src/lacerna.mjs index 3fc28cdc05b..499acf28a51 100644 --- a/designs/lunetius/src/lacerna.mjs +++ b/designs/lunetius/src/lacerna.mjs @@ -53,15 +53,15 @@ function lunetiusLacerna({ points.bottomShoulderCp2 = points.bottomLeft.shiftFractionTowards(points.bottomShoulder, 0.5) // Add paths - paths.fold = new Path().move(points.bottom).line(points.top).setRender(false) + paths.fold = new Path().move(points.bottom).line(points.top).hide() paths.hem = new Path() .move(points.topLeft) .line(points.middleLeft) .curve(points.bottomShoulderCp1, points.bottomShoulderCp2, points.bottomShoulder) .line(points.bottom) - .setRender(false) - paths.saBase = new Path().move(points.top).line(points.topLeft).setRender(false) - paths.seam = paths.saBase.join(paths.hem).join(paths.fold).attr('class', 'fabric').setRender(true) + .hide() + paths.saBase = new Path().move(points.top).line(points.topLeft).hide() + paths.seam = paths.saBase.join(paths.hem).join(paths.fold).attr('class', 'fabric').hide() // Complete? if (complete) { diff --git a/designs/noble/src/backoutside.mjs b/designs/noble/src/backoutside.mjs index e3a379fd2d7..80fb39786fc 100644 --- a/designs/noble/src/backoutside.mjs +++ b/designs/noble/src/backoutside.mjs @@ -21,7 +21,7 @@ function nobleBackOutside({ .move(points.shoulderDart) .curve(points.shoulderDart, points.shoulderDartCpUp, points.dartTip) .curve(points.shoulderDartCpDown, points.dartRightCp, points.dartBottomRight) - .setRender(false) + .hide() paths.outsideSeam = new Path() .move(points.dartBottomRight) diff --git a/designs/noble/src/frontoutside.mjs b/designs/noble/src/frontoutside.mjs index 7c0c7eb8a6b..2317138e23a 100644 --- a/designs/noble/src/frontoutside.mjs +++ b/designs/noble/src/frontoutside.mjs @@ -32,12 +32,12 @@ function nobleFrontOutside({ points.waistUpDartRight ) .curve(points.waistUpDartRightCpDown, points.waistCpUp, points.waistDartRight) - .setRender(false) + .hide() paths.armhole = new Path() .move(points.armhole) .curve(points.armholeCp2, points.armholePitchCp1, points.armholePitch) .curve_(points.armholePitchCp2, points.shoulder) - .setRender(false) + .hide() paths.seam = new Path() .move(points.waistDartRight) @@ -53,7 +53,7 @@ function nobleFrontOutside({ .move(points.armholeDartOutside) .curve(points.armholeCircleOutsideCp1, points.waistCircleOutsideCp1, points.waistUpDartRight) .curve(points.waistUpDartRightCpDown, points.waistCpUp, points.waistDartRight) - .setRender(false) + .hide() paths.seam = new Path() .move(points.waistDartRight) diff --git a/designs/octoplushy/src/arm.mjs b/designs/octoplushy/src/arm.mjs index ec7ee60eb98..379bd0f073e 100644 --- a/designs/octoplushy/src/arm.mjs +++ b/designs/octoplushy/src/arm.mjs @@ -153,7 +153,7 @@ function octoplushyArmSection( .move(points.armBottomLeft) .curve(points.armBottomLeftCp1, points.armBottomCp2, points.armBottom) .curve(points.armBottomCp1, points.armBottomRightCp2, points.armBottomRight) - .setRender(false) + .hide() if (options.type == 'squid') { if (partNumber == 1) { paths.armBottom = new Path() @@ -162,7 +162,7 @@ function octoplushyArmSection( .curve(points.tentacleLeftCp1, points.armBottomCp2, points.armBottom) .curve(points.armBottomCp1, points.tentacleRightCp2, points.tentacleRight) .curve(points.tentacleRightCp1, points.armBottomRightCp2, points.armBottomRight) - .setRender(false) + .hide() } } diff --git a/designs/octoplushy/src/eye.mjs b/designs/octoplushy/src/eye.mjs index 1c3b9242ae1..0b1b2c9f731 100644 --- a/designs/octoplushy/src/eye.mjs +++ b/designs/octoplushy/src/eye.mjs @@ -60,7 +60,7 @@ function octoplushyEye( .curve(points.rightCp1, points.topCp2, points.top) .close() .attr('class', 'fabric') - .setRender(true) + .hide() points.logo = points.top.shiftFractionTowards(points.bottom, 0.3) points.titleAnchor = points.bottom .shiftFractionTowards(points.top, 0.25) @@ -83,7 +83,7 @@ function octoplushyEye( .line(points.tl) .close() .attr('class', 'fabric') - .setRender(true) + .hide() points.logo = points.tl .shiftFractionTowards(points.bl, 0.5) diff --git a/designs/octoplushy/src/head.mjs b/designs/octoplushy/src/head.mjs index 3123c355e8e..f0dde3d03ea 100644 --- a/designs/octoplushy/src/head.mjs +++ b/designs/octoplushy/src/head.mjs @@ -78,7 +78,7 @@ function octoplushyHeadSection( .move(points.circleTop) .curve(points.sectionTopCp1, points.sectionLeftCp2, points.sectionLeft) .curve(points.sectionLeftCp1, points.sectionBottomCp2, points.circleBottom) - .setRender(true) + .unhide() let iteration = 0 let diff = 0 @@ -106,7 +106,7 @@ function octoplushyHeadSection( .move(points.circleTop) .curve(points.sectionTopCp1, points.sectionLeftCp2, points.sectionLeft) .curve(points.sectionLeftCp1, points.sectionBottomCp2, points.circleBottom) - .setRender(false) + .hide() points.sectionBottomLeft = utils.curveIntersectsY( points.sectionLeft, @@ -299,7 +299,7 @@ function octoplushyHeadSection( .move(points.armBottomLeft) .curve(points.armBottomLeftCp1, points.armBottomCp2, points.armBottom) .curve(points.armBottomCp1, points.armBottomRightCp2, points.armBottomRight) - .setRender(false) + .hide() if (options.type == 'squid') { paths.sectionLeft = new Path() @@ -307,20 +307,20 @@ function octoplushyHeadSection( .curve(points.sectionTopCp1, points.sectionLeftCp2, points.sectionLeft) .curve(points.sectionLeftCp1, points.sectionMidLeftCp2, points.sectionMidLeft) .curve(points.sectionMidLeftCp1, points.sectionBottomLeftCp2, points.sectionBottomLeft) - .setRender(false) + .hide() paths.sectionRight = new Path() .move(points.sectionBottomRight) .curve(points.sectionBottomRightCp1, points.sectionMidRightCp2, points.sectionMidRight) .curve(points.sectionMidRightCp1, points.sectionRightCp2, points.sectionRight) - .setRender(false) + .hide() paths.skirtLeft = new Path() .move(points.sectionBottomLeft) .curve(points.sectionBottomLeftCp1, points.armTopLeftCp2, points.armTopLeft) - .setRender(false) + .hide() paths.skirtRight = new Path() .move(points.armTopRight) .curve(points.armTopRightCp1, points.sectionBottomRightCp2, points.sectionBottomRight) - .setRender(false) + .hide() if (partNumber == 1) { paths.sectionLeft = new Path() .move(points.sectionTop) @@ -330,45 +330,45 @@ function octoplushyHeadSection( .curve(points.finSectionCp1, points.sectionLeftCp2, points.sectionLeft) .curve(points.sectionLeftCp1, points.sectionMidLeftCp2, points.sectionMidLeft) .curve(points.sectionMidLeftCp1, points.sectionBottomLeftCp2, points.sectionBottomLeft) - .setRender(false) + .hide() paths.armBottom = new Path() .move(points.armBottomLeft) .curve(points.armBottomLeftCp1, points.tentacleLeftCp2, points.tentacleLeft) .curve(points.tentacleLeftCp1, points.armBottomCp2, points.armBottom) .curve(points.armBottomCp1, points.tentacleRightCp2, points.tentacleRight) .curve(points.tentacleRightCp1, points.armBottomRightCp2, points.armBottomRight) - .setRender(false) + .hide() } } else { paths.sectionLeft = new Path() .move(points.sectionTop) .curve(points.sectionTopCp1, points.sectionLeftCp2, points.sectionLeft) .curve(points.sectionLeftCp1, points.sectionBottomLeftCp2, points.sectionBottomLeft) - .setRender(false) + .hide() paths.sectionRight = new Path() .move(points.sectionBottomRight) .curve(points.sectionBottomRightCp1, points.sectionRightCp2, points.sectionRight) - .setRender(false) + .hide() if (points.skirtBottomLeft.sitsRoughlyOn(points.armTopLeft)) { paths.skirtLeft = new Path() .move(points.sectionBottomLeft) .curve(points.sectionBottomLeftCp1, points.skirtBottomLeft, points.skirtBottomLeft) - .setRender(false) + .hide() paths.skirtRight = new Path() .move(points.armTopRight) .curve(points.skirtBottomRight, points.sectionBottomRightCp2, points.sectionBottomRight) - .setRender(false) + .hide() } else { paths.skirtLeft = new Path() .move(points.sectionBottomLeft) .curve(points.sectionBottomLeftCp1, points.skirtBottomLeft, points.skirtBottomLeft) .curve(points.skirtBottomLeft, points.armTopLeftCp2, points.armTopLeft) - .setRender(false) + .hide() paths.skirtRight = new Path() .move(points.armTopRight) .curve(points.armTopRightCp1, points.skirtBottomRight, points.skirtBottomRight) .curve(points.skirtBottomRight, points.sectionBottomRightCp2, points.sectionBottomRight) - .setRender(false) + .hide() } } @@ -385,16 +385,6 @@ function octoplushyHeadSection( .close() .attr('class', 'fabric') - // paths.box = new Path() - // .move(points.topLeft) - // .line(points.bottomLeft) - // .line(points.bottomRight) - // .line(points.topRight) - // .line(points.topLeft) - // .close() - // .attr('class', 'fabric') - // .setRender(false) - // Complete? if (complete) { points.logo = points.sectionTop.shiftFractionTowards( diff --git a/designs/penelope/src/back.mjs b/designs/penelope/src/back.mjs index c252089275c..af24f2f439f 100644 --- a/designs/penelope/src/back.mjs +++ b/designs/penelope/src/back.mjs @@ -39,13 +39,9 @@ function penelopeBack(params) { .line(points.vTop) .line(points.vLeg) .line(points.vHem) - .setRender(false) + .hide() - paths.leftSide = new Path() - .move(points.lWaist) - .line(points.lVent) - .join(paths.vent) - .setRender(false) + paths.leftSide = new Path().move(points.lWaist).line(points.lVent).join(paths.vent).hide() paths.hem = paths.hem.line(points.vLeg) } diff --git a/designs/penelope/src/shape.mjs b/designs/penelope/src/shape.mjs index 3ed8955bda3..8200e9e773f 100644 --- a/designs/penelope/src/shape.mjs +++ b/designs/penelope/src/shape.mjs @@ -125,7 +125,7 @@ export function BuildMainShape( waistCurve = new Path() .move(points.lWaist) .curve(points.lWaistCP, points.rWaistCPleft, points.rWaist) - .setRender(false) + .hide() if (nrOfDarts > 0) { curve1 = addDartToCurve( @@ -199,7 +199,7 @@ export function BuildMainShape( .move(points.lLeg) .line(points.rLeg) .attr('class', 'fabric stroke-sm') - .setRender(false) + .hide() if (store.get('hem') > 0) { // Create the inverse of the curve from the leg to the waist @@ -214,18 +214,18 @@ export function BuildMainShape( sideSeamPath = sideSeamHemPath.join(sideSeamPath) - paths.hem.setRender(true) + paths.hem.unhide() } - paths.leftSide = new Path().move(points.lWaist).line(points.lHem).setRender(false) + paths.leftSide = new Path().move(points.lWaist).line(points.lHem).hide() - paths.bottom = new Path().move(points.lHem).line(points.rHem).setRender(false) + paths.bottom = new Path().move(points.lHem).line(points.rHem).hide() - paths.sideSeam = sideSeamPath.setRender(false) + paths.sideSeam = sideSeamPath.hide() // Turn the path in the other direction, to comply with the counter-clockwise guideline - paths.waist = waistPath.reverse().setRender(false) - paths.waistSA = waistPathSA.reverse().setRender(false) + paths.waist = waistPath.reverse().hide() + paths.waistSA = waistPathSA.reverse().hide() points.titleAnchor = new Point(measurements.waist / 6, measurements.waistToSeat) points.logoAnchor = points.titleAnchor.shift(270, 75) diff --git a/designs/penelope/src/utils.mjs b/designs/penelope/src/utils.mjs index e8ff5c415d4..691d0d6670e 100644 --- a/designs/penelope/src/utils.mjs +++ b/designs/penelope/src/utils.mjs @@ -143,13 +143,13 @@ function addDartToCurve(part, curvePath, distance, dartSize, dartDepth) { let curveLeftOfDart = new part.Path() .move(curvePaths[0].ops[0].to) .curve(curvePaths[0].ops[1].cp1, leftDartCP, dartLeft) - .setRender(false) + .hide() let curveRightOfDart = new part.Path() .move(dartRight) .curve(rightDartCP, curvePaths[1].ops[1].cp2, curvePaths[1].ops[1].to) - .setRender(false) + .hide() - let dart = new part.Path().move(dartLeft).line(dartBottom).line(dartRight).setRender(false) + let dart = new part.Path().move(dartLeft).line(dartBottom).line(dartRight).hide() let curveWithDart = { left: curveLeftOfDart, diff --git a/designs/teagan/src/back.mjs b/designs/teagan/src/back.mjs index 2faa0119784..4b2afa3fe2c 100644 --- a/designs/teagan/src/back.mjs +++ b/designs/teagan/src/back.mjs @@ -24,7 +24,7 @@ function teaganBack({ points.shoulderCp1 = points.shoulderCp1.shiftFractionTowards(points.shoulder, 0.25) // Draw seamline - paths.hemBase = new Path().move(points.cfHem).line(points.hem).setRender(false) + paths.hemBase = new Path().move(points.cfHem).line(points.hem).hide() paths.saBase = new Path() .move(points.hem) .curve_(points.waistCp2, points.armhole) @@ -32,14 +32,14 @@ function teaganBack({ .curve(points.armholeHollowCp2, points.shoulderCp1, points.shoulder) .line(points.neck) .curve(points.neckCp2, points.cbNeckCp1, points.cbNeck) - .setRender(false) + .hide() paths.seam = new Path() .move(points.cfHem) .join(paths.hemBase) .join(paths.saBase) .line(points.cfHem) .close() - .setRender(true) + .hide() .attr('class', 'fabric') // Set store values required to draft sleevecap diff --git a/designs/teagan/src/sleeve.mjs b/designs/teagan/src/sleeve.mjs index edba8540e32..b8acda13855 100644 --- a/designs/teagan/src/sleeve.mjs +++ b/designs/teagan/src/sleeve.mjs @@ -25,7 +25,7 @@ function teaganSleeve({ .curve(points.capQ2Cp2, points.capQ3Cp1, points.capQ3) .edge('top') - paths.hemBase = new Path().move(points.hemLeft).line(points.hemRight).setRender(false) + paths.hemBase = new Path().move(points.hemLeft).line(points.hemRight).hide() paths.saBase = new Path() .move(points.hemRight) .line(points.bicepsRight) @@ -35,7 +35,7 @@ function teaganSleeve({ .curve(points.capQ3Cp2, points.capQ4Cp1, points.capQ4) .curve(points.capQ4Cp2, points.bicepsLeft, points.bicepsLeft) .line(points.hemLeft) - .setRender(false) + .hide() paths.seam = new Path() .move(points.hemLeft) .join(paths.hemBase) diff --git a/designs/tiberius/src/tunica.mjs b/designs/tiberius/src/tunica.mjs index 68dbdaa82c8..14763f99c5b 100644 --- a/designs/tiberius/src/tunica.mjs +++ b/designs/tiberius/src/tunica.mjs @@ -62,14 +62,10 @@ function tiberiusTunica({ points.armholeLeft = points.topLeft.shift(-90, armhole) // draw paths - paths.saBase = new Path() - .move(points.top) - .line(points.topLeft) - .line(points.bottomLeft) - .setRender(false) - paths.hem = new Path().move(points.bottomLeft).line(points.bottom).setRender(false) - paths.fold = new Path().move(points.bottom).line(points.top).setRender(false) - paths.seam = paths.saBase.join(paths.hem).join(paths.fold).setRender(true).attr('class', 'fabric') + paths.saBase = new Path().move(points.top).line(points.topLeft).line(points.bottomLeft).hide() + paths.hem = new Path().move(points.bottomLeft).line(points.bottom).hide() + paths.fold = new Path().move(points.bottom).line(points.top).hide() + paths.seam = paths.saBase.join(paths.hem).join(paths.fold).unhide().attr('class', 'fabric') // clavi if (options.clavi) { diff --git a/designs/ursula/src/back.mjs b/designs/ursula/src/back.mjs index 57e755673de..afdab7e0796 100644 --- a/designs/ursula/src/back.mjs +++ b/designs/ursula/src/back.mjs @@ -177,7 +177,7 @@ function ursulaBack({ points.backLegOpeningRightCp1, points.backLegOpeningRight ) - .setRender(false) + .hide() : new Path() .move(points.backGussetRight) .curve(points.backGussetRightCp1, points.backFlareRightCp2, points.backFlareRight) @@ -186,13 +186,13 @@ function ursulaBack({ points.backLegOpeningRightCp1, points.backLegOpeningRight ) - .setRender(false) + .hide() store.set('backLegOpeningLength', paths.backLegOpening.length()) paths.backWaistBand = new Path() .move(points.backWaistBandRight) .curve(points.backWaistBandRightCp1, points.backWaistBandLeftCp1, points.backWaistBandLeft) - .setRender(false) + .hide() store.set('backWaistBandLength', paths.backWaistBand.length()) // Complete? diff --git a/designs/ursula/src/front.mjs b/designs/ursula/src/front.mjs index 57152e43d1f..cea0c2cea94 100644 --- a/designs/ursula/src/front.mjs +++ b/designs/ursula/src/front.mjs @@ -131,13 +131,13 @@ function ursulaFront({ paths.frontLegOpening = new Path() .move(points.frontGussetRight) .curve(points.frontGussetRightCp1, points.frontLegOpeningRightCp1, points.frontLegOpeningRight) - .setRender(false) + .hide() store.set('frontLegOpeningLength', paths.frontLegOpening.length()) paths.frontWaistBand = new Path() .move(points.frontWaistBandRight) .curve(points.frontWaistBandRightCp1, points.frontWaistBandLeftCp1, points.frontWaistBandLeft) - .setRender(false) + .hide() store.set('frontWaistBandLength', paths.frontWaistBand.length()) // Complete? diff --git a/designs/walburga/src/base.mjs b/designs/walburga/src/base.mjs index 76602909c63..ecd0ac0a042 100644 --- a/designs/walburga/src/base.mjs +++ b/designs/walburga/src/base.mjs @@ -54,7 +54,7 @@ function walburgaBase({ .line(points.triangleLeft) .line(points.bottomMiddle) .line(points.triangle) - .setRender(false) + .hide() paths.seam = new Path() .move(points.top) .line(points.topLeft) @@ -112,7 +112,7 @@ function walburgaBase({ ) ) .line(points.triangle) - .setRender(false) + .hide() // Insop the start paths.sa = paths.saBase @@ -124,7 +124,7 @@ function walburgaBase({ .line(points.topLeft.shift(90, sa)) ) .attr('class', 'fabric sa') - .setRender(true) + .unhide() } // Paperless? diff --git a/designs/walburga/src/front.mjs b/designs/walburga/src/front.mjs index 6f85c6d718b..c61b379eb61 100644 --- a/designs/walburga/src/front.mjs +++ b/designs/walburga/src/front.mjs @@ -89,11 +89,7 @@ function walburgaFront({ if (sa) { if (options.neckline === true) { // Insop the start - paths.saHelper = new Path() - .move(points.neckomid) - .line(points.neckotop) - .offset(sa) - .setRender(false) + paths.saHelper = new Path().move(points.neckomid).line(points.neckotop).offset(sa).hide() paths.sa = paths.saBase .insop( 'start', @@ -116,7 +112,7 @@ function walburgaFront({ .line(points.topLeft.shift(90, sa)) ) .attr('class', 'fabric sa') - .setRender(true) + .unhide() } } diff --git a/designs/waralee/src/facings.mjs b/designs/waralee/src/facings.mjs index fc322ceb76a..949d00534a7 100644 --- a/designs/waralee/src/facings.mjs +++ b/designs/waralee/src/facings.mjs @@ -38,7 +38,7 @@ function waraleeFacings({ .line(points.frontTL) .close() .attr('class', 'fabric') - .setRender(options.frontPocket && 'welt' == options.frontPocketStyle) + .setHidden(!(options.frontPocket && 'welt' == options.frontPocketStyle)) paths.backSeam = new Path() .move(points.backTL) @@ -48,7 +48,7 @@ function waraleeFacings({ .line(points.backTL) .close() .attr('class', 'fabric') - .setRender(options.backPocket) + .setHidden(!options.backPocket) // Complete? if (complete) { diff --git a/designs/waralee/src/waistband.mjs b/designs/waralee/src/waistband.mjs index c53998b68c3..bd22dbb2136 100644 --- a/designs/waralee/src/waistband.mjs +++ b/designs/waralee/src/waistband.mjs @@ -160,7 +160,7 @@ function waraleeWaistband( .line(points.bl) .line(points.br) .close() - .setRender(false) + .hide() // Complete? if (complete) { diff --git a/designs/yuri/src/gusset.mjs b/designs/yuri/src/gusset.mjs index 2e833038604..b72abf1414e 100644 --- a/designs/yuri/src/gusset.mjs +++ b/designs/yuri/src/gusset.mjs @@ -50,7 +50,7 @@ function yuriGusset({ points.logo = points.title.shift(-75, 100) snippets.logo = new Snippet('logo', points.logo) if (sa) { - paths.saBase = new Path().move(points.right).line(points.top).setRender(false) + paths.saBase = new Path().move(points.right).line(points.top).hide() paths.sa = paths.curve .offset(3 * sa) .join(paths.saBase.offset(sa))