From 15eb860a31978e5ed3ffe38b7907f555f107e894 Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Fri, 26 May 2023 13:15:56 +0200 Subject: [PATCH] Conflict checker: follow-up to previous commit: the wipe tower may be rotated without being invalidated, in which case the rotation would not be updated in the conflict checker --- src/libslic3r/Print.cpp | 2 +- src/libslic3r/Print.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index c2a20e034..7ef199639 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -966,7 +966,7 @@ void Print::process() std::optional wipe_tower_opt = {}; if (this->has_wipe_tower()) { - m_fake_wipe_tower.set_pos({ m_config.wipe_tower_x, m_config.wipe_tower_y }); + m_fake_wipe_tower.set_pos_and_rotation({ m_config.wipe_tower_x, m_config.wipe_tower_y }, m_config.wipe_tower_rotation_angle); wipe_tower_opt = std::make_optional(&m_fake_wipe_tower); } auto conflictRes = ConflictChecker::find_inter_of_lines_in_diff_objs(m_objects, wipe_tower_opt); diff --git a/src/libslic3r/Print.hpp b/src/libslic3r/Print.hpp index 47fc3ebb0..25fcc449b 100644 --- a/src/libslic3r/Print.hpp +++ b/src/libslic3r/Print.hpp @@ -442,7 +442,7 @@ struct FakeWipeTower plate_origin = o; } - void set_pos(const Vec2f& p) { pos = p; } + void set_pos_and_rotation(const Vec2f& p, float rotation) { pos = p; rotation_angle = rotation; } std::vector getFakeExtrusionPathsFromWipeTower() const {