From bd850d4be73508a93516a7f88c66609b8ae2bf1e Mon Sep 17 00:00:00 2001 From: Joost De Cock Date: Fri, 10 Aug 2018 16:43:08 +0200 Subject: [PATCH] sparkles: Made shoulderEase a percentage option --- packages/brian/config/config.js | 2 +- packages/brian/index.html | 8 ++++---- packages/brian/src/base.js | 12 +++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/brian/config/config.js b/packages/brian/config/config.js index 6c4a76fc7c9..5a7d1874b47 100644 --- a/packages/brian/config/config.js +++ b/packages/brian/config/config.js @@ -19,7 +19,6 @@ export default { // Measures lengthBonus: { val: 0, min: -40, max: 120, type: "measure" }, - shoulderEase: { val: 0, min: -20, max: 60, type: "measure" }, sleeveLengthBonus: { val: 0, min: -40, max: 80, type: "measure" }, // Percentages @@ -31,6 +30,7 @@ export default { collarEase: { val: 3.5, min: 0, max: 10 }, cuffEase: { val: 20, min: 0, max: 200 }, frontArmholeDeeper: { val: 0.5, min: 0, max: 1.5 }, + shoulderEase: { val: 0, min: -2, max: 6 }, shoulderSlopeReduction: { val: 0, min: 0, max: 8 }, sleevecapEase: { val: 1, min: 0, max: 10 }, sleevecapBackFactorX: { val: 50, min: 35, max: 65 }, diff --git a/packages/brian/index.html b/packages/brian/index.html index 20c3575e83e..bb1ae8eb281 100644 --- a/packages/brian/index.html +++ b/packages/brian/index.html @@ -29,7 +29,7 @@ var pattern = freesewing.patterns.brian .with(debug) .with(freesewing.plugins.theme) - // .with(freesewing.plugins.designer) + .with(freesewing.plugins.designer) /* pattern.on('preSample', function(next) { console.log('preSample hook'); @@ -90,7 +90,7 @@ next(); }); -pattern.settings.paperless = true; +//pattern.settings.paperless = true; pattern.settings.measurements = freesewing.models.men.manSize36; @@ -101,10 +101,10 @@ pattern.settings.sample = { measurement: 'shoulderToShoulder' } pattern.debug('debug test from index', 'foo'); - pattern.sampleOption('shoulderSlopeReduction'); + pattern.sampleOption('shoulderEase'); //pattern.sampleMeasurement('bicepsCircumference'); //pattern.sampleModels(freesewing.antmantest); -//pattern.draft(); + //pattern.draft(); document.getElementById("svg").innerHTML = pattern.render(); function pointHover(evt) { diff --git a/packages/brian/src/base.js b/packages/brian/src/base.js index 0000fc07dc4..1c646994822 100644 --- a/packages/brian/src/base.js +++ b/packages/brian/src/base.js @@ -6,7 +6,12 @@ var base = { part.render = false; // prettier-ignore - let {measurements, options, points, paths, snippets, Path, Point, Snippet, utils, final, paperless, sa, macro} = part.shorthand(); + let {measurements, options, store, points, paths, snippets, Path, Point, Snippet, utils, final, paperless, sa, macro} = part.shorthand(); + + store.set( + "shoulderEase", + (measurements.shoulderToShoulder * options.shoulderEase) / 2 + ); // Center back (cb) vertical axis points.cbNeck = new Point( @@ -50,13 +55,14 @@ var base = { 0 ); points.shoulder = new Point( - measurements.shoulderToShoulder / 2 + options.shoulderEase / 2, + measurements.shoulderToShoulder / 2 + store.get("shoulderEase"), points.cbShoulder.y ); // Armhhole points.armholePitch = new Point( - (measurements.shoulderToShoulder * options.acrossBackFactor) / 2, + (measurements.shoulderToShoulder * options.acrossBackFactor) / 2 + + store.get("shoulderEase") / 2, points.shoulder.y + points.shoulder.dy(points.armhole) / 2 ); points._tmp1 = new Point(points.armholePitch.x, points.armhole.y);