1
0
Fork 0

fire: Switched to plugin-bundle

This commit is contained in:
Joost De Cock 2018-08-11 14:13:40 +02:00
parent 9907fb371c
commit 79f27d2efa
18 changed files with 1123 additions and 238 deletions

1
packages/brian/bundle.js Symbolic link
View file

@ -0,0 +1 @@
../plugins/plugin-bundle/dist/browser.js

View file

@ -7,93 +7,24 @@
<body>
<div id="svg"></div>
<script type="text/javascript" src="freesewing.js"></script>
<script type="text/javascript" src="tmp/cutonfold.js"></script>
<script type="text/javascript" src="tmp/grainline.js"></script>
<script type="text/javascript" src="tmp/dimension.js"></script>
<script type="text/javascript" src="tmp/logo.js"></script>
<script type="text/javascript" src="tmp/title.js"></script>
<script type="text/javascript" src="bundle.js"></script>
<script type="text/javascript" src="dist/browser.js"></script>
<script type="text/javascript" src="tmp/theme.js"></script>
<script type="text/javascript" src="tmp/designer.js"></script>
<script type="text/javascript" src="tmp/debug.js"></script>
<script type="text/javascript" src="tmp/models.js"></script>
<script type="text/javascript" src="tmp/validate.js"></script>
<script type="text/javascript" src="tmp/antmantest.js"></script>
<script>
var debug = {
name: 'debug',
hooks: {
debug: function (next, d='',e='',b='',u='',g='') {
console.log('%cDebug', 'color: #dd69dd; font-weight: bold', d,e,b,u,g);
next();
}
}
};
var pattern = freesewing.patterns.brian
.with(debug)
.with(freesewing.plugins.debug)
.with(freesewing.plugins.theme)
//.with(freesewing.plugins.designer)
/*
pattern.on('preSample', function(next) {
console.log('preSample hook');
next();
});
.with(freesewing.plugins.designer)
.with(freesewing.plugins.validate)
;
pattern.on('postSample', function(next) {
console.log('postSample hook');
next();
});
pattern.on('preDraft', function(next) {
console.log('preDraft hook', JSON.parse(JSON.stringify(this)));
next();
});
pattern.on('postDraft', function(next) {
console.log('postDraft hook', JSON.parse(JSON.stringify(this)));
next();
});
pattern.on('preRender', function(next) {
console.log('preRender hook', this);
next();
});
pattern.on('postRender', function(next) {
console.log('postRender hook', this);
next();
});
pattern.on('preDraft', function(next) {
console.log('%cpreDraft hook', 'color: red', this);
next();
});
pattern.on('postDraft', function(next) {
console.log('%cpostDraft hook', 'color: red', this);
next();
});
pattern.on('insertText', function(next) {
console.log('%cinsertText hook', 'color: red', this.text);
this.text = this.text.toUpperCase();
next();
});
*/
pattern.on('preDraft', function(next) {
console.log('%cpreDraft hook', 'color: red', this);
for(let m in this.config.measurements) {
let measurement = this.config.measurements[m];
if(!this.context.settings.measurements[measurement]) {
this.debug('Missing measurement:', measurement);
this.debug('All measurements:', this.settings.measurements);
throw `Missing measurement: ${measurement}`;
}
}
next();
});
//pattern.settings.paperless = true;
pattern.settings.measurements = freesewing.models.men.manSize36;
pattern.settings.paperless = true;
pattern.settings.measurements = freesewing.models.men.manSize36;
pattern.settings.sa = 10;
pattern.settings.units = 'metric';

File diff suppressed because it is too large Load diff

View file

@ -46,11 +46,8 @@
]
},
"dependencies": {
"@freesewing/plugin-cutonfold": "0.7.2",
"@freesewing/plugin-grainline": "0.0.1",
"@freesewing/plugin-logo": "^0.2.1",
"@freesewing/plugin-title": "0.5.1",
"freesewing": "^0.6.0"
"freesewing": "^0.6.0",
"@freesewing/plugin-bundle": "0.0.1"
},
"devDependencies": {
"@babel/core": "7.0.0-beta.56",

View file

@ -23,22 +23,11 @@ export default {
// }
//})
],
external: [
"freesewing",
"@freesewing/plugin-grainline",
"@freesewing/plugin-cutonfold",
"@freesewing/plugin-dimension",
"@freesewing/plugin-logo",
"@freesewing/plugin-title"
],
external: ["freesewing", "@freesewing/plugin-bundle"],
output: {
globals: {
freesewing: "freesewing",
"@freesewing/plugin-cutonfold": "freesewing.plugins.cutonfold",
"@freesewing/plugin-grainline": "freesewing.plugins.grainline",
"@freesewing/plugin-dimension": "freesewing.plugins.dimension",
"@freesewing/plugin-logo": "freesewing.plugins.logo",
"@freesewing/plugin-title": "freesewing.plugins.title"
"@freesewing/plugin-bundle": "freesewing.plugins.bundle"
}
}
};

View file

@ -2,9 +2,7 @@ import freesewing from "freesewing";
import * as shared from "./shared";
var back = {
draft: function(pattern) {
let part = new pattern.Part().copy(pattern.parts.base);
draft: function(part) {
// prettier-ignore
let {store, sa, points, Path, paths, Snippet, snippets, final, paperless, macro} = part.shorthand();

View file

@ -1,8 +1,7 @@
import freesewing from "freesewing";
var base = {
draft: function(pattern) {
let part = new pattern.Part();
draft: function(part) {
part.render = false;
// prettier-ignore

View file

@ -3,9 +3,7 @@ import base from "./base";
import * as shared from "./shared";
var front = {
draft: function(pattern) {
let part = new pattern.Part().copy(pattern.parts.back);
draft: function(part) {
// prettier-ignore
let {store, sa, Point, points, Path, paths, Snippet, snippets, options, measurements, final, paperless, macro} = part.shorthand();

View file

@ -1,9 +1,5 @@
import freesewing from "freesewing";
import pluginCutonfold from "@freesewing/plugin-cutonfold";
import pluginGrainline from "@freesewing/plugin-grainline";
import pluginDimension from "@freesewing/plugin-dimension";
import pluginLogo from "@freesewing/plugin-logo";
import pluginTitle from "@freesewing/plugin-title";
import pluginBundle from "@freesewing/plugin-bundle";
import config from "../config/config";
import { version } from "../package.json";
@ -13,39 +9,22 @@ import back from "./back";
import front from "./front";
import sleeve from "./sleeve";
var pattern = new freesewing.Pattern({ version: version, ...config })
.with(pluginCutonfold)
.with(pluginGrainline)
.with(pluginDimension)
.with(pluginLogo)
.with(pluginTitle);
var pattern = new freesewing.Pattern({ version: version, ...config }).with(
pluginBundle
);
pattern.draft = function() {
pattern.parts.base = this.draftBase();
pattern.parts.back = this.draftBack();
pattern.parts.front = this.draftFront();
pattern.parts.sleeve = this.draftSleeve();
this.parts.base = this.draftBase(new pattern.Part());
this.parts.back = this.draftBack(new pattern.Part().copy(this.parts.base));
this.parts.front = this.draftFront(new pattern.Part().copy(this.parts.back));
this.parts.sleeve = this.draftSleeve(new pattern.Part());
return pattern;
};
pattern.draftBase = function(pattern = false) {
if (pattern === false) pattern = this;
return base.draft(pattern);
};
pattern.draftBase = part => base.draft(part);
pattern.draftBack = part => back.draft(part);
pattern.draftFront = part => front.draft(part);
pattern.draftSleeve = part => sleeve.draft(part);
pattern.draftBack = function(pattern = false) {
if (pattern === false) pattern = this;
return back.draft(pattern);
};
pattern.draftFront = function(pattern = false) {
if (pattern === false) pattern = this;
return front.draft(pattern);
};
pattern.draftSleeve = function(pattern = false) {
if (pattern === false) pattern = this;
return sleeve.draft(pattern);
};
export default pattern;

View file

@ -41,22 +41,23 @@ export function shoulderToArmholePitch(points, Path) {
}
export function dimensions(macro, points, Path, sa) {
console.log("points for dimensions", points);
macro("pd", {
path: new Path()
.move(points.armhole)
.curve(points.armholeCp1, points.armholeCp1, points.armholeHollow)
.curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
.curve(
points.armholeHollowCp1,
points.armholeHollowCp1,
points.armholeHollowCp2,
points.armholePitchCp1,
points.armholePitch
)
.curve(points.shoulderCp1, points.shoulderCp1, points.shoulder),
.curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder),
d: sa + 15
});
macro("pd", {
path: new Path()
.move(points.armholePitch)
.curve(points.shoulderCp1, points.shoulderCp1, points.shoulder),
.curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder),
d: -15
});
macro("vd", {

View file

@ -145,8 +145,7 @@ function draftSleevecap(part, run) {
}
var sleeve = {
draft: function(pattern) {
let part = new pattern.Part();
draft: function(part) {
// prettier-ignore
let {debug, store, units, sa, measurements, options, Point, points, Path, paths, Snippet, snippets, final, paperless, macro} = part.shorthand();

View file

@ -1 +0,0 @@
../../plugins/plugin-cutonfold/dist/browser.js

1
packages/brian/tmp/debug.js Symbolic link
View file

@ -0,0 +1 @@
../../plugins/plugin-debug/dist/browser.js

View file

@ -1 +0,0 @@
../../plugins/plugin-dimension/dist/browser.js

View file

@ -1 +0,0 @@
../../plugins/plugin-grainline/dist/browser.js

View file

@ -1 +0,0 @@
../../plugins/plugin-logo/dist/browser.js

View file

@ -1 +0,0 @@
../../plugins/plugin-title/dist/browser.js

View file

@ -0,0 +1 @@
../../plugins/plugin-validate/dist/browser.js