3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict checker: follow-up to previous commit:

Browse Source 
the wipe tower may be rotated without being invalidated, in which case the rotation would not be updated in the conflict checker
This commit is contained in:
Lukas Matena 2023-05-26 13:15:56 +02:00
parent 985bb54748
commit 15eb860a31
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Print.cpp
View File

@ -966,7 +966,7 @@ void Print::process()
std::optional<const FakeWipeTower*> wipe_tower_opt = {}; std::optional<const FakeWipeTower*> wipe_tower_opt = {};
if (this->has_wipe_tower()) { 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<const FakeWipeTower*>(&m_fake_wipe_tower); wipe_tower_opt = std::make_optional<const FakeWipeTower*>(&m_fake_wipe_tower);
} }
auto conflictRes = ConflictChecker::find_inter_of_lines_in_diff_objs(m_objects, wipe_tower_opt); auto conflictRes = ConflictChecker::find_inter_of_lines_in_diff_objs(m_objects, wipe_tower_opt);

2
src/libslic3r/Print.hpp
View File

@ -442,7 +442,7 @@ struct FakeWipeTower
plate_origin = o; 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<ExtrusionPaths> getFakeExtrusionPathsFromWipeTower() const std::vector<ExtrusionPaths> getFakeExtrusionPathsFromWipeTower() const
{ {