VSinerva/freesewing
1
0
Fork 0
Code Activity

✨ Change the part::inject method to keep @woutervdub happy

Browse source
This commit is contained in:
Joost De Cock 2019-05-10 17:38:47 +02:00
parent 576683bf33
commit ec2c9f17df
1 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
packages/core/src/part.js
View file

@ -155,13 +155,38 @@ Part.prototype.attr = function(name, value, overwrite = false) {
/** Copies point/path/snippet data from part orig into this */ /** Copies point/path/snippet data from part orig into this */
Part.prototype.inject = function(orig) { Part.prototype.inject = function(orig) {
for (let type of ["points", "paths", "snippets"]) { const findBasePoint = p => {
for (let i in orig[type]) { for (let i in orig.points) {
if (typeof this[type][i] === "undefined") { if (orig.points[i] === p) return i;
this[type][i] = orig[type][i].clone(); }
return false;
};
for (let i in orig.points) this.points[i] = orig.points[i].clone();
for (let i in orig.paths) {
this.paths[i] = orig.paths[i].clone();
// Keep link between points and path ops where possible
for (let j in orig.paths[i].ops) {
let op = orig.paths[i].ops[j];
if (op.type !== "close") {
let toPoint = findBasePoint(op.to);
if (toPoint) this.paths[i].ops[j].to = this.points[toPoint];
}
if (op.type === "curve") {
let cp1Point = findBasePoint(op.cp1);
if (cp1Point) this.paths[i].ops[j].cp1 = this.points[cp1Point];
let cp2Point = findBasePoint(op.cp2);
if (cp2Point) this.paths[i].ops[j].cp2 = this.points[cp2Point];
} }
} }
} }
for (let i in orig.snippets) {
this.snippets[i] = orig.snippets[i].clone();
// Keep link between points and snippet anchor where possible
let anchorPoint = findBasePoint(orig.snippets[i].anchor);
if (anchorPoint) this.snippets[i].anchor = this.points[i];
}
return this; return this;
}; };