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

Follow-up to f24b4e86a9:

Browse Source 
Refactoring of G-code export to LayerSlices / LayerIslands:
Fixed some bugs
This commit is contained in:
Vojtech Bubnik 2022-11-07 20:00:34 +01:00
parent 28f8997dd3
commit 5eaec515ba
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/GCode/ToolOrdering.cpp
View File

@ -667,7 +667,7 @@ float WipingExtrusions::mark_wiping_extrusions(const Print& print, const LayerTo
// we will sort objects so that dedicated for wiping are at the beginning: // we will sort objects so that dedicated for wiping are at the beginning:
ConstPrintObjectPtrs object_list(print.objects().begin(), print.objects().end()); ConstPrintObjectPtrs object_list(print.objects().begin(), print.objects().end());
std::sort(object_list.begin(), object_list.end(), [](const PrintObject* a, const PrintObject* b) { return a->config().wipe_into_objects; }); std::sort(object_list.begin(), object_list.end(), [](const PrintObject* a, const PrintObject* b) { return a->config().wipe_into_objects && ! b->config().wipe_into_objects; });
// We will now iterate through // We will now iterate through
// - first the dedicated objects to mark perimeters or infills (depending on infill_first) // - first the dedicated objects to mark perimeters or infills (depending on infill_first)

7
src/libslic3r/GCode/ToolOrdering.hpp
View File

@ -30,7 +30,12 @@ public:
} }
// When allocating extruder overrides of an object's ExtrusionEntity, overrides for maximum 3 copies are allocated in place. // When allocating extruder overrides of an object's ExtrusionEntity, overrides for maximum 3 copies are allocated in place.
typedef boost::container::small_vector<int32_t, 3> ExtruderPerCopy; using ExtruderPerCopy =
#ifdef NDEBUG
boost::container::small_vector<int32_t, 3>;
#else // NDEBUG
std::vector<int32_t>;
#endif // NDEBUG
// This is called from GCode::process_layer_single_object() // This is called from GCode::process_layer_single_object()
// Returns positive number if the extruder is overridden. // Returns positive number if the extruder is overridden.

25
src/libslic3r/Layer.cpp
View File

@ -233,9 +233,9 @@ static void connect_layer_slices(
} }
} }
for (int32_t islice = 0; islice < above.lslices_ex.size(); ++ islice) { for (int32_t islice = 0; islice < above.lslices_ex.size(); ++ islice) {
LayerSlice::Links &links1 = above.lslices_ex[islice].overlaps_above; LayerSlice::Links &links1 = above.lslices_ex[islice].overlaps_below;
for (LayerSlice::Link &link1 : links1) { for (LayerSlice::Link &link1 : links1) {
LayerSlice::Links &links2 = below.lslices_ex[link1.slice_idx].overlaps_below; LayerSlice::Links &links2 = below.lslices_ex[link1.slice_idx].overlaps_above;
assert(! std::binary_search(links2.begin(), links2.end(), link1, [](auto &l, auto &r){ return l.slice_idx < r.slice_idx; })); assert(! std::binary_search(links2.begin(), links2.end(), link1, [](auto &l, auto &r){ return l.slice_idx < r.slice_idx; }));
} }
} }
@ -688,25 +688,18 @@ void Layer::sort_perimeters_into_islands(
std::numeric_limits<double>::max() : std::numeric_limits<double>::max() :
(lslices[lslice_idx].point_projection(point) - point).cast<double>().squaredNorm(); (lslices[lslice_idx].point_projection(point) - point).cast<double>().squaredNorm();
}; };
for (int lslice_idx = int(lslices_ex.size()) - 1; lslice_idx >= 0 && ! perimeter_slices_queue.empty(); -- lslice_idx) { for (auto it_source_slice = perimeter_slices_queue.begin(); it_source_slice != perimeter_slices_queue.end(); ++ it_source_slice) {
double d2min = std::numeric_limits<double>::max(); double d2min = std::numeric_limits<double>::max();
auto it_source_slice = perimeter_slices_queue.end(); int lslice_idx_min = -1;
for (auto it = perimeter_slices_queue.begin(); it != perimeter_slices_queue.end(); ++ it) for (int lslice_idx = int(lslices_ex.size()) - 1; lslice_idx >= 0 && ! perimeter_slices_queue.empty(); -- lslice_idx)
if (double d2 = point_inside_surface_dist2(lslice_idx, it->second); d2 < d2min) { if (double d2 = point_inside_surface_dist2(lslice_idx, it_source_slice->second); d2 < d2min) {
d2min = d2; d2min = d2;
it_source_slice = it; lslice_idx_min = lslice_idx;
} }
assert(it_source_slice != perimeter_slices_queue.end()); assert(lslice_idx_min != -1);
if (it_source_slice != perimeter_slices_queue.end()) { insert_into_island(lslice_idx_min, it_source_slice->first);
insert_into_island(lslice_idx, it_source_slice->first);
if (std::next(it_source_slice) != perimeter_slices_queue.end())
// Remove the current slice & point pair from the queue.
*it_source_slice = perimeter_slices_queue.back();
perimeter_slices_queue.pop_back();
} }
} }
assert(perimeter_slices_queue.empty());
}
void Layer::export_region_slices_to_svg(const char *path) const void Layer::export_region_slices_to_svg(const char *path) const
{ {