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

Fix clockwise movements for skirt and brim

Browse Source
This commit is contained in:
Martin Šach 2024-07-01 10:23:35 +02:00 committed by Lukas Matena
parent af4a1d67a9
commit a59fd32962
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libslic3r/GCode/ExtrusionOrder.cpp
View File

@ -537,7 +537,12 @@ std::vector<ExtruderExtrusions> get_extrusions(
if (auto loops_it = skirt_loops_per_extruder.find(extruder_id); loops_it != skirt_loops_per_extruder.end()) {
const std::pair<size_t, size_t> loops = loops_it->second;
for (std::size_t i = loops.first; i < loops.second; ++i) {
const ExtrusionEntityReference entity{*print.skirt().entities[i], false};
bool reverse{false};
if (auto loop = dynamic_cast<const ExtrusionLoop *>(print.skirt().entities[i])) {
const bool is_hole = loop->is_clockwise();
reverse = print.config().prefer_clockwise_movements ? !is_hole : is_hole;
}
const ExtrusionEntityReference entity{*print.skirt().entities[i], reverse};
std::optional<InstancePoint> last_position{get_instance_point(previous_position, {0, 0})};
SmoothPath path{smooth_path(nullptr, entity, extruder_id, last_position)};
previous_position = get_gcode_point(last_position, {0, 0});
@ -548,11 +553,18 @@ std::vector<ExtruderExtrusions> get_extrusions(
// Extrude brim with the extruder of the 1st region.
if (get_brim) {
for (const ExtrusionEntity *entity : print.brim().entities) {
const ExtrusionEntityReference entity_reference{*entity, false};
bool reverse{false};
bool is_loop{false};
if (auto loop = dynamic_cast<const ExtrusionLoop *>(entity)) {
const bool is_hole = loop->is_clockwise();
is_loop = true;
reverse = print.config().prefer_clockwise_movements ? !is_hole : is_hole;
}
const ExtrusionEntityReference entity_reference{*entity, reverse};
std::optional<InstancePoint> last_position{get_instance_point(previous_position, {0, 0})};
SmoothPath path{smooth_path(nullptr, entity_reference, extruder_id, last_position)};
previous_position = get_gcode_point(last_position, {0, 0});
const bool is_loop{dynamic_cast<const ExtrusionLoop *>(entity) != nullptr};
extruder_extrusions.brim.push_back({std::move(path), is_loop});
}
get_brim = false;