juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 00:52:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wipe tower skirt alignment by computing bbx from actual first-layer polygon (#12457)

Browse Source
This commit is contained in:
SoftFever
2026-02-25 12:37:05 +08:00
parent 1a57ec13a5
commit f054e3ad9b
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libslic3r/GCode/WipeTower2.cpp
View File

@@ -2134,6 +2134,11 @@ WipeTower::ToolChangeResult WipeTower2::finish_layer()
// Save actual brim width to be later passed to the Print object, which will use it
// for skirt calculation and pass it to GLCanvas for precise preview box
m_wipe_tower_brim_width_real = loops_num * spacing;
// Compute actual first-layer bounding box from the outermost brim polygon,
// matching how WipeTower::get_bbx() uses m_outer_wall extents.
BoundingBox first_layer_box = get_extents(poly);
m_first_layer_bbx = BoundingBoxf(unscale(first_layer_box.min), unscale(first_layer_box.max));
}
// Now prepare future wipe.

10
src/libslic3r/GCode/WipeTower2.hpp
View File

@@ -61,12 +61,13 @@ public:
float get_wipe_tower_height() const { return m_wipe_tower_height; }
// ORCA: Match WipeTower API used by Print skirt/brim planning.
// Returned bounding box is in WIPE-TOWER-LOCAL coordinates (before placement on the bed).
// Keep this as the nominal tower footprint (including brim), without dynamic y_shift.
// Computed from the actual first-layer polygon (including brim), like WipeTower::get_bbx().
BoundingBoxf get_bbx() const {
if (m_first_layer_bbx.defined)
return m_first_layer_bbx;
// Fallback: nominal rectangle (used if generate() hasn't run yet)
const float brim = m_wipe_tower_brim_width_real;
const Vec2d min(-brim, -brim);
const Vec2d max(double(m_wipe_tower_width) + brim, double(m_wipe_tower_depth) + brim);
return BoundingBoxf(min, max);
return BoundingBoxf(Vec2d(-brim, -brim), Vec2d(double(m_wipe_tower_width) + brim, double(m_wipe_tower_depth) + brim));
}
// WT2 doesn't currently compute a rib-origin compensation like WipeTower (m_rib_offset),
// so expose a zero offset for consistency purposes (to maintain API parity).
@@ -203,6 +204,7 @@ private:
float m_wipe_tower_cone_angle = 0.f;
float m_wipe_tower_brim_width = 0.f; // Width of brim (mm) from config
float m_wipe_tower_brim_width_real = 0.f; // Width of brim (mm) after generation
BoundingBoxf m_first_layer_bbx; // Actual first-layer bounding box (incl. brim/ribs)
float m_wipe_tower_rotation_angle = 0.f; // Wipe tower rotation angle in degrees (with respect to x axis)
float m_internal_rotation = 0.f;
float m_y_shift = 0.f; // y shift passed to writer