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

Adjust the last layer to align with the top object layer exactly

Browse Source
This commit is contained in:
supermerill 2018-07-02 17:24:07 +02:00 committed by supermerill
parent 47ad0dad77
commit 55b91d2987
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xs/src/libslic3r/Slicing.cpp
View File

@ -216,6 +216,7 @@ std::vector<coordf_t> layer_height_profile_from_ranges(
// Based on the work of @platsch // Based on the work of @platsch
// Fill layer_height_profile by heights ensuring a prescribed maximum cusp height. // Fill layer_height_profile by heights ensuring a prescribed maximum cusp height.
// @Deprecated not used anymore (see PrintObject::update_layer_height_profile)
std::vector<coordf_t> layer_height_profile_adaptive( std::vector<coordf_t> layer_height_profile_adaptive(
const SlicingParameters &slicing_params, const SlicingParameters &slicing_params,
const t_layer_height_ranges &layer_height_ranges, const t_layer_height_ranges &layer_height_ranges,
@ -551,7 +552,34 @@ std::vector<coordf_t> generate_object_layers(
out.push_back(print_z); out.push_back(print_z);
} }
//FIXME Adjust the last layer to align with the top object layer exactly? // Adjust the last layer to align with the top object layer exactly
if (out.size() > 0 && slicing_params.object_print_z_height() != out[out.size()-1]){
float neededPrintZ = slicing_params.object_print_z_height();
int idx_layer = out.size() / 2 - 1;
float diffZ = neededPrintZ - out[idx_layer * 2 + 1];
while (diffZ > EPSILON || diffZ < -EPSILON && idx_layer >= 0){
float newH = out[idx_layer * 2 + 1] - out[idx_layer * 2];
if (diffZ > 0){
newH = std::min((float)slicing_params.max_layer_height, newH + diffZ);
} else{
newH = std::max((float)slicing_params.min_layer_height, newH + diffZ);
}
out[idx_layer * 2 + 1] = neededPrintZ;
out[idx_layer * 2] = neededPrintZ - newH;
//next item
neededPrintZ = out[idx_layer * 2];
idx_layer--;
if (idx_layer >= 0){
diffZ = neededPrintZ - out[idx_layer * 2 + 1];
} else{
//unlikely to happen. note: can create a layer outside the min/max bounds.
diffZ = 0;
out[idx_layer * 2] = 0;
}
}
}
return out; return out;
} }