3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed behaviour of infill wiping for multiple copies of an object

Browse source
This commit is contained in:
Lukas Matena 2018-06-04 12:15:59 +02:00
parent d6c444fefa
commit 7c9d594ff6
2 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xs/src/libslic3r/GCode.cpp
View file

@ -1262,9 +1262,6 @@ void GCode::process_layer(
// This shouldn't happen but first_point() would fail. // This shouldn't happen but first_point() would fail.
continue; continue;
/*if (fill->is_extruder_overridden())
continue;*/
// init by_extruder item only if we actually use the extruder // init by_extruder item only if we actually use the extruder
int extruder_id = std::max<int>(0, (is_solid_infill(fill->entities.front()->role()) ? region.config.solid_infill_extruder : region.config.infill_extruder) - 1); int extruder_id = std::max<int>(0, (is_solid_infill(fill->entities.front()->role()) ? region.config.solid_infill_extruder : region.config.infill_extruder) - 1);
// Init by_extruder item only if we actually use the extruder. // Init by_extruder item only if we actually use the extruder.
@ -1285,12 +1282,12 @@ void GCode::process_layer(
// We just added fill->entities.size() entities, if they are not to be printed before the main object (during infill wiping), // We just added fill->entities.size() entities, if they are not to be printed before the main object (during infill wiping),
// we will note their indices (for each copy separately): // we will note their indices (for each copy separately):
unsigned int last_added_entity_index = islands[i].by_region[region_id].infills.entities.size()-1; unsigned int last_added_entity_index = islands[i].by_region[region_id].infills.entities.size()-1;
for (unsigned copy_id = 0; copy_id < layer_to_print.object()->copies().size(); ++copy_id) { for (unsigned copy_id = 0; copy_id < layer_to_print.object()->_shifted_copies.size(); ++copy_id) {
if (islands[i].by_region[region_id].infills_per_copy_ids.size() < copy_id + 1) // if this copy isn't in the list yet if (islands[i].by_region[region_id].infills_per_copy_ids.size() < copy_id + 1) // if this copy isn't in the list yet
islands[i].by_region[region_id].infills_per_copy_ids.push_back(std::vector<unsigned int>()); islands[i].by_region[region_id].infills_per_copy_ids.push_back(std::vector<unsigned int>());
if (!fill->is_extruder_overridden(copy_id)) if (!fill->is_extruder_overridden(copy_id))
for (int j=0; j<fill->entities.size(); ++j) for (int j=0; j<fill->entities.size(); ++j)
islands[i].by_region[region_id].infills_per_copy_ids.back().push_back(last_added_entity_index - j); islands[i].by_region[region_id].infills_per_copy_ids[copy_id].push_back(last_added_entity_index - j);
} }
break; break;
} }
@ -1401,7 +1398,6 @@ void GCode::process_layer(
else else
copies.push_back(print_object->_shifted_copies[single_object_idx]); copies.push_back(print_object->_shifted_copies[single_object_idx]);
// Sort the copies by the closest point starting with the current print position. // Sort the copies by the closest point starting with the current print position.
unsigned int copy_id = 0; unsigned int copy_id = 0;
for (const Point &copy : copies) { for (const Point &copy : copies) {

2
xs/src/libslic3r/Print.cpp
View file

@ -1191,7 +1191,7 @@ float Print::mark_wiping_infill(const ToolOrdering::LayerTools& layer_tools, uns
if (this_layer == nullptr) if (this_layer == nullptr)
continue; continue;
for (unsigned int copy = 0; copy < objects[i]->copies().size(); ++copy) { // iterate through copies first, so that we mark neighbouring infills for (unsigned int copy = 0; copy < objects[i]->_shifted_copies.size(); ++copy) { // iterate through copies first, so that we mark neighbouring infills
for (size_t region_id = 0; region_id < objects[i]->print()->regions.size(); ++ region_id) { for (size_t region_id = 0; region_id < objects[i]->print()->regions.size(); ++ region_id) {
unsigned int region_extruder = objects[i]->print()->regions[region_id]->config.infill_extruder - 1; // config value is 1-based unsigned int region_extruder = objects[i]->print()->regions[region_id]->config.infill_extruder - 1; // config value is 1-based