GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 03:32:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Forgot to handle multiple objects at the same time when bucket sorting. Fixed.

Browse Source
This commit is contained in:
Joseph Lenox 2018-07-26 23:00:18 -05:00
parent 71009d8c90
commit f625c69f41
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
xs/src/libslic3r/PrintGCode.cpp
View File

@ -186,33 +186,34 @@ PrintGCode::output()
std::vector<size_t> z; std::vector<size_t> z;
z.reserve(100); // preallocate with 100 layers z.reserve(100); // preallocate with 100 layers
std::map<coord_t, LayerPtrs> layers {}; std::map<coord_t, std::map<size_t, LayerPtrs > > layers {};
for (size_t idx = 0U; idx < print.objects.size(); ++idx) { for (size_t idx = 0U; idx < print.objects.size(); ++idx) {
const auto& object {*(objects.at(idx))}; const auto& object {*(objects.at(idx))};
// sort layers by Z into buckets // sort layers by Z into buckets
for (Layer* layer : object.layers) { for (Layer* layer : object.layers) {
if (layers.count(scale_(layer->print_z)) == 0) { // initialize bucket if empty if (layers.count(scale_(layer->print_z)) == 0) { // initialize bucket if empty
layers[scale_(layer->print_z)] = LayerPtrs();
layers[scale_(layer->print_z)] = std::map<size_t, LayerPtrs >();
layers[scale_(layer->print_z)][idx] = LayerPtrs();
z.emplace_back(scale_(layer->print_z)); z.emplace_back(scale_(layer->print_z));
} }
layers[scale_(layer->print_z)].emplace_back(layer); layers[scale_(layer->print_z)][idx].emplace_back(layer);
} }
for (Layer* layer : object.support_layers) { // don't use auto here to not have to cast later for (Layer* layer : object.support_layers) { // don't use auto here to not have to cast later
if (layers.count(scale_(layer->print_z)) == 0) { // initialize bucket if empty if (layers.count(scale_(layer->print_z)) == 0) { // initialize bucket if empty
layers[scale_(layer->print_z)] = LayerPtrs(); layers[scale_(layer->print_z)] = std::map<size_t, LayerPtrs >();
z.emplace_back(scale_(layer->print_z)); layers[scale_(layer->print_z)][idx] = LayerPtrs();
} }
layers[scale_(layer->print_z)].emplace_back(layer); layers[scale_(layer->print_z)][idx].emplace_back(layer);
} }
} }
// pass the comparator to leave no doubt. // pass the comparator to leave no doubt.
std::sort(z.begin(), z.end(), std::less<size_t>()); std::sort(z.begin(), z.end(), std::less<size_t>());
// call process_layers in the order given by obj_idx // call process_layers in the order given by obj_idx
for (const auto& print_z : z) { for (const auto& print_z : z) {
for (const auto& idx : obj_idx) { for (const auto& idx : obj_idx) {
for (const auto* layer : layers.at(print_z)) { for (const auto* layer : layers[print_z][idx] ) {
this->process_layer(idx, layer, layer->object()->_shifted_copies); this->process_layer(idx, layer, layer->object()->_shifted_copies);
} }
} }