VSinerva/freesewing
1
0
Fork 0
Code Activity

sparkles: Made shoulderEase a percentage option

Browse source
This commit is contained in:
Joost De Cock 2018-08-10 16:43:08 +02:00
parent a40ba3015d
commit bd850d4be7
3 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/brian/config/config.js
View file

@ -19,7 +19,6 @@ export default {
// Measures // Measures
lengthBonus: { val: 0, min: -40, max: 120, type: "measure" }, 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" }, sleeveLengthBonus: { val: 0, min: -40, max: 80, type: "measure" },
// Percentages // Percentages
@ -31,6 +30,7 @@ export default {
collarEase: { val: 3.5, min: 0, max: 10 }, collarEase: { val: 3.5, min: 0, max: 10 },
cuffEase: { val: 20, min: 0, max: 200 }, cuffEase: { val: 20, min: 0, max: 200 },
frontArmholeDeeper: { val: 0.5, min: 0, max: 1.5 }, frontArmholeDeeper: { val: 0.5, min: 0, max: 1.5 },
shoulderEase: { val: 0, min: -2, max: 6 },
shoulderSlopeReduction: { val: 0, min: 0, max: 8 }, shoulderSlopeReduction: { val: 0, min: 0, max: 8 },
sleevecapEase: { val: 1, min: 0, max: 10 }, sleevecapEase: { val: 1, min: 0, max: 10 },
sleevecapBackFactorX: { val: 50, min: 35, max: 65 }, sleevecapBackFactorX: { val: 50, min: 35, max: 65 },

6
packages/brian/index.html
View file

@ -29,7 +29,7 @@
var pattern = freesewing.patterns.brian var pattern = freesewing.patterns.brian
.with(debug) .with(debug)
.with(freesewing.plugins.theme) .with(freesewing.plugins.theme)
// .with(freesewing.plugins.designer) .with(freesewing.plugins.designer)
/* /*
pattern.on('preSample', function(next) { pattern.on('preSample', function(next) {
console.log('preSample hook'); console.log('preSample hook');
@ -90,7 +90,7 @@
next(); next();
}); });
pattern.settings.paperless = true; //pattern.settings.paperless = true;
pattern.settings.measurements = freesewing.models.men.manSize36; pattern.settings.measurements = freesewing.models.men.manSize36;
@ -101,7 +101,7 @@ pattern.settings.sample = {
measurement: 'shoulderToShoulder' measurement: 'shoulderToShoulder'
} }
pattern.debug('debug test from index', 'foo'); pattern.debug('debug test from index', 'foo');
pattern.sampleOption('shoulderSlopeReduction'); pattern.sampleOption('shoulderEase');
//pattern.sampleMeasurement('bicepsCircumference'); //pattern.sampleMeasurement('bicepsCircumference');
//pattern.sampleModels(freesewing.antmantest); //pattern.sampleModels(freesewing.antmantest);
//pattern.draft(); //pattern.draft();

12
packages/brian/src/base.js
View file

@ -6,7 +6,12 @@ var base = {
part.render = false; part.render = false;
// prettier-ignore // 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 // Center back (cb) vertical axis
points.cbNeck = new Point( points.cbNeck = new Point(
@ -50,13 +55,14 @@ var base = {
0 0
); );
points.shoulder = new Point( points.shoulder = new Point(
measurements.shoulderToShoulder / 2 + options.shoulderEase / 2, measurements.shoulderToShoulder / 2 + store.get("shoulderEase"),
points.cbShoulder.y points.cbShoulder.y
); );
// Armhhole // Armhhole
points.armholePitch = new Point( 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.shoulder.y + points.shoulder.dy(points.armhole) / 2
); );
points._tmp1 = new Point(points.armholePitch.x, points.armhole.y); points._tmp1 = new Point(points.armholePitch.x, points.armhole.y);