GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 10:39:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix XL arrangement disrespecting minimum bed distance

Browse Source
This commit is contained in:
tamasmeszaros 2023-03-06 13:45:58 +01:00
parent 384eebadcc
commit 0f5ecb6b74
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libslic3r/Arrange.cpp
View File

@ -705,24 +705,23 @@ void arrange(ArrangePolygons &items,
auto pilesz = unscaled(pilebb[bedidx]).size(); auto pilesz = unscaled(pilebb[bedidx]).size();
bb.max.x() = scaled(std::ceil(pilesz.x() / piecesz.x()) * piecesz.x()); bb.max.x() = scaled(std::ceil(pilesz.x() / piecesz.x()) * piecesz.x());
bb.max.y() = scaled(std::ceil(pilesz.y() / piecesz.y()) * piecesz.y()); bb.max.y() = scaled(std::ceil(pilesz.y() / piecesz.y()) * piecesz.y());
coord_t offs = params.min_bed_distance;
switch (params.alignment) { switch (params.alignment) {
case Pivots::BottomLeft: case Pivots::BottomLeft:
bb.translate((bed.bb.min - bb.min) + Point{offs, offs}); bb.translate(bed.bb.min - bb.min);
break; break;
case Pivots::TopRight: case Pivots::TopRight:
bb.translate((bed.bb.max - bb.max) - Point{offs, offs}); bb.translate(bed.bb.max - bb.max);
break; break;
case Pivots::BottomRight: { case Pivots::BottomRight: {
Point bedref{bed.bb.max.x(), bed.bb.min.y()}; Point bedref{bed.bb.max.x(), bed.bb.min.y()};
Point bbref {bb.max.x(), bb.min.y()}; Point bbref {bb.max.x(), bb.min.y()};
bb.translate((bedref - bbref) + Point{-offs, offs}); bb.translate(bedref - bbref);
break; break;
} }
case Pivots::TopLeft: { case Pivots::TopLeft: {
Point bedref{bed.bb.min.x(), bed.bb.max.y()}; Point bedref{bed.bb.min.x(), bed.bb.max.y()};
Point bbref {bb.min.x(), bb.max.y()}; Point bbref {bb.min.x(), bb.max.y()};
bb.translate((bedref - bbref) + Point{offs, -offs}); bb.translate(bedref - bbref);
break; break;
} }
case Pivots::Center: { case Pivots::Center: {
@ -733,6 +732,19 @@ void arrange(ArrangePolygons &items,
Vec2crd d = bb.center() - pilebb[bedidx].center(); Vec2crd d = bb.center() - pilebb[bedidx].center();
auto bedbb = bed.bb;
bedbb.offset(-params.min_bed_distance);
auto pilebbx = pilebb[bedidx];
pilebbx.translate(d);
Point corr{0, 0};
corr.x() = -std::min(0, pilebbx.min.x() - bedbb.min.x())
-std::max(0, pilebbx.max.x() - bedbb.max.x());
corr.y() = -std::min(0, pilebbx.min.y() - bedbb.min.y())
-std::max(0, pilebbx.max.y() - bedbb.max.y());
d += corr;
for (auto &itm : items) for (auto &itm : items)
if (itm.bed_idx == bedidx) if (itm.bed_idx == bedidx)
itm.translation += d; itm.translation += d;