VSinerva/freesewing
1
0
Fork 0
Code Activity

use part transforms to calculate stack bounds instead of part bounds

Browse source
This commit is contained in:
Enoch Riese 2023-04-14 15:42:22 -04:00
parent a7276ce95d
commit 29a0b08a1d
2 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/core/src/part.mjs
View file

@ -269,15 +269,6 @@ Part.prototype.__boundary = function () {
if (bottomRight.x === -Infinity) bottomRight.x = 0
if (bottomRight.y === -Infinity) bottomRight.y = 0
// Handle part transforms
const transforms = this.attributes.get('transform')
if (transforms) {
const combinedTransform =
typeof transforms === 'string' ? transforms : utils.combineTransforms(transforms)
topLeft = utils.applyTransformToPoint(combinedTransform, topLeft)
bottomRight = utils.applyTransformToPoint(combinedTransform, bottomRight)
}
this.topLeft = topLeft
this.bottomRight = bottomRight
this.width = this.bottomRight.x - this.topLeft.x

31
packages/core/src/stack.mjs
View file

@ -51,10 +51,33 @@ Stack.prototype.home = function () {
this.bottomRight = new Point(-Infinity, -Infinity)
for (const part of this.getPartList()) {
part.__boundary()
if (part.topLeft.x < this.topLeft.x) this.topLeft.x = part.topLeft.x
if (part.topLeft.y < this.topLeft.y) this.topLeft.y = part.topLeft.y
if (part.bottomRight.x > this.bottomRight.x) this.bottomRight.x = part.bottomRight.x
if (part.bottomRight.y > this.bottomRight.y) this.bottomRight.y = part.bottomRight.y
const transforms = part.attributes.get('transform')
let tl = part.topLeft
let br = part.bottomRight
let tr = new Point(br.x, tl.y)
let bl = new Point(tl.x, br.y)
if (transforms) {
const combinedTransform =
typeof transforms === 'string' ? transforms : utils.combineTransforms(transforms)
tl = utils.applyTransformToPoint(combinedTransform, part.topLeft.copy())
br = utils.applyTransformToPoint(combinedTransform, part.bottomRight.copy())
bl = utils.applyTransformToPoint(
combinedTransform,
new Point(part.topLeft.x, part.bottomRight.y)
)
tr = utils.applyTransformToPoint(
combinedTransform,
new Point(part.bottomRight.x, part.topLeft.y)
)
}
this.topLeft.x = Math.min(this.topLeft.x, tl.x, br.x, bl.x, tr.x)
this.topLeft.y = Math.min(this.topLeft.y, tl.y, br.y, bl.y, tr.y)
this.bottomRight.x = Math.max(this.bottomRight.x, tl.x, br.x, bl.x, tr.x)
this.bottomRight.y = Math.max(this.bottomRight.y, tl.y, br.y, bl.y, tr.y)
}
// Fix infinity if it's not overwritten