GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-28 19:33:11 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: Fix the incorrect num of top_interface_layer && always add one transition layer

Browse Source 
jira: STUDIO-11987
Change-Id: Iedcd43249dde584d97ff2da8925235720be9c6db
This commit is contained in:
jiaxi.chen 2025-04-30 20:21:55 +08:00 committed by lane.wei
parent de14cfbac6
commit badb8dbf46
2 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/libslic3r/Support/SupportCommon.cpp
View File

@ -139,27 +139,25 @@ std::pair<SupportGeneratorLayersPtr, SupportGeneratorLayersPtr> generate_interfa
Polygons polygons_bottom_contact_projected_interface; Polygons polygons_bottom_contact_projected_interface;
Polygons polygons_bottom_contact_projected_base; Polygons polygons_bottom_contact_projected_base;
if (support_params.num_top_interface_layers > 0) { if (support_params.num_top_interface_layers > 0) {
// Top Z coordinate of a slab, over which we are collecting the top / bottom contact surfaces
coordf_t top_z = intermediate_layers[std::min(num_intermediate - 1, idx_intermediate_layer + int(support_params.num_top_interface_layers) - 1)]->print_z;
coordf_t top_inteface_z = std::numeric_limits<coordf_t>::max();
if (support_params.num_top_base_interface_layers > 0)
// Some top base interface layers will be generated.
top_inteface_z = support_params.num_top_interface_layers_only() == 0 ?
// Only base interface layers to generate.
- std::numeric_limits<coordf_t>::max() :
intermediate_layers[std::min(num_intermediate - 1, idx_intermediate_layer + int(support_params.num_top_interface_layers_only()) - 1)]->print_z;
// Move idx_top_contact_first up until above the current print_z. // Move idx_top_contact_first up until above the current print_z.
idx_top_contact_first = idx_higher_or_equal(top_contacts, idx_top_contact_first, [&intermediate_layer](const SupportGeneratorLayer *layer){ return layer->print_z >= intermediate_layer.print_z; }); // - EPSILON idx_top_contact_first = idx_higher_or_equal(top_contacts, idx_top_contact_first, [&intermediate_layer](const SupportGeneratorLayer *layer){ return layer->print_z >= intermediate_layer.print_z; }); // - EPSILON
// Collect the top contact areas above this intermediate layer, below top_z. // Collect the top contact areas above this intermediate layer, below top_z.
for (int idx_top_contact = idx_top_contact_first; idx_top_contact < int(top_contacts.size()); ++ idx_top_contact) { for (int idx_top_contact = idx_top_contact_first; idx_top_contact < int(top_contacts.size()); ++ idx_top_contact) {
const SupportGeneratorLayer &top_contact_layer = *top_contacts[idx_top_contact]; const SupportGeneratorLayer &top_contact_layer = *top_contacts[idx_top_contact];
//FIXME maybe this adds one interface layer in excess? const bool is_top_contact = is_approx(top_contact_layer.bottom_z, intermediate_layers[num_intermediate - 1]->print_z);
if (top_contact_layer.bottom_z - EPSILON > top_z) if (is_top_contact) {
break; if (idx_intermediate_layer > num_intermediate - support_params.num_top_interface_layers)
polygons_append(top_contact_layer.bottom_z - EPSILON > top_inteface_z ? polygons_top_contact_projected_base : polygons_top_contact_projected_interface, polygons_append(polygons_top_contact_projected_interface, snug_supports ? *top_contact_layer.overhang_polygons : top_contact_layer.polygons);
// For snug supports, project the overhang polygons covering the whole overhang, so that they will merge without a gap with support polygons of the other layers. else if (idx_intermediate_layer > num_intermediate - support_params.num_top_interface_layers - support_params.num_top_base_interface_layers)
// For grid supports, merging of support regions will be performed by the projection into grid. polygons_append(polygons_top_contact_projected_base, snug_supports ? *top_contact_layer.overhang_polygons : top_contact_layer.polygons);
snug_supports ? *top_contact_layer.overhang_polygons : top_contact_layer.polygons); } else {
if (top_contact_layer.print_z - EPSILON <
intermediate_layers[std::min(int(idx_intermediate_layer + support_params.num_top_interface_layers - 1), num_intermediate - 1)]->print_z)
polygons_append(polygons_top_contact_projected_interface, snug_supports ? *top_contact_layer.overhang_polygons : top_contact_layer.polygons);
else if (top_contact_layer.print_z - EPSILON < intermediate_layers[std::min(int(idx_intermediate_layer + support_params.num_top_interface_layers -
1 + support_params.num_top_base_interface_layers),num_intermediate - 1)]->print_z)
polygons_append(polygons_top_contact_projected_base, snug_supports ? *top_contact_layer.overhang_polygons : top_contact_layer.polygons);
}
} }
} }
if (support_params.num_bottom_interface_layers > 0) { if (support_params.num_bottom_interface_layers > 0) {
@ -208,16 +206,22 @@ std::pair<SupportGeneratorLayersPtr, SupportGeneratorLayersPtr> generate_interfa
} }
}); });
tbb::parallel_for(tbb::blocked_range<int>(1, int(base_interface_layers.size())), [&base_interface_layers](const tbb::blocked_range<int> &range) { if (support_params.num_top_base_interface_layers > 1)
for (int layer_id = range.begin(); layer_id < range.end(); ++layer_id) { tbb::parallel_for(tbb::blocked_range<int>(1, int(base_interface_layers.size())),
auto &base_interface_layer = base_interface_layers[layer_id]; [&base_interface_layers, &top_contacts, &support_params, &intermediate_layers](const tbb::blocked_range<int> &range) {
if (!base_interface_layer) return; for (int layer_id = range.begin(); layer_id < range.end(); ++layer_id) {
auto &base_interface_layer = base_interface_layers[layer_id];
auto &lower_layer = base_interface_layers[layer_id - 1]; if (!base_interface_layer) return;
if (!lower_layer) return;
if (base_interface_layer->polygons == lower_layer->polygons) base_interface_layer->up = true; for (const auto &contact : top_contacts) {
} if (is_approx(contact->bottom_z, intermediate_layers[layer_id - 1 + support_params.num_top_interface_layers]->print_z, 0.01) &&
}); overlaps(base_interface_layer->polygons, contact->polygons)) {
base_interface_layer->up = true;
break;
}
}
}
});
// Compress contact_out, remove the nullptr items. // Compress contact_out, remove the nullptr items.
// The parallel_for above may not have merged all the interface and base_interface layers // The parallel_for above may not have merged all the interface and base_interface layers

3
src/libslic3r/Support/SupportParameters.hpp
View File

@ -43,7 +43,7 @@ struct SupportParameters {
// support_filament==0 // support_filament==0
bool differnt_support_interface_filament = object_config.support_interface_filament != 0 && bool differnt_support_interface_filament = object_config.support_interface_filament != 0 &&
object_config.support_interface_filament != object_config.support_filament; object_config.support_interface_filament != object_config.support_filament;
this->num_top_base_interface_layers = differnt_support_interface_filament && num_top_interface_layers > 0 ? 2 : 0; this->num_top_base_interface_layers = num_top_interface_layers > 0 ? differnt_support_interface_filament ? 2 : 1 : 0;
this->num_bottom_base_interface_layers = differnt_support_interface_filament ? 1 : 0; this->num_bottom_base_interface_layers = differnt_support_interface_filament ? 1 : 0;
} }
} }
@ -130,6 +130,7 @@ struct SupportParameters {
} }
support_base_pattern = object_config.support_base_pattern; support_base_pattern = object_config.support_base_pattern;
if (support_base_pattern == smpLightning && !is_tree(object_config.support_type)) support_base_pattern = smpRectilinear;
if (support_base_pattern == smpDefault) { if (support_base_pattern == smpDefault) {
if (is_tree(object_config.support_type)) if (is_tree(object_config.support_type))
support_base_pattern = support_style == smsTreeHybrid ? smpRectilinear : smpNone; support_base_pattern = support_style == smsTreeHybrid ? smpRectilinear : smpNone;