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

FIX: blockers are not working correctly with organic supports.

Browse source 
jira: STUDIO-6278
Change-Id: If74e611821db25241dd67dfc4a3e44fac557a10d
(cherry picked from commit 76b9b2b7e856f648082cd3a09386775695c6accb)
(cherry picked from commit cf35d0268fce05308d56b87bc2c50eb822451c02)
This commit is contained in:
Arthur 2024-03-08 16:35:05 +08:00 • committed by Noisyfox
parent 242a36a262
commit 4ee6d636c7
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/Support/TreeSupport3D.cpp
View file

@ -216,6 +216,7 @@ static std::vector<std::pair<TreeSupportSettings, std::vector<size_t>>> group_me
double tan_threshold = support_threshold_auto ? 0. : tan(M_PI * double(support_threshold + 1) / 180.); double tan_threshold = support_threshold_auto ? 0. : tan(M_PI * double(support_threshold + 1) / 180.);
//FIXME this is a fudge constant! //FIXME this is a fudge constant!
auto enforcer_overhang_offset = scaled<double>(config.tree_support_tip_diameter.value); auto enforcer_overhang_offset = scaled<double>(config.tree_support_tip_diameter.value);
const coordf_t radius_sample_resolution = g_config_tree_support_collision_resolution;
// calc the extrudable expolygons of each layer // calc the extrudable expolygons of each layer
const coordf_t extrusion_width = config.line_width.value; const coordf_t extrusion_width = config.line_width.value;
@ -234,7 +235,7 @@ static std::vector<std::pair<TreeSupportSettings, std::vector<size_t>>> group_me
size_t num_overhang_layers = support_auto ? num_object_layers : std::min(num_object_layers, std::max(size_t(support_enforce_layers), enforcers_layers.size())); size_t num_overhang_layers = support_auto ? num_object_layers : std::min(num_object_layers, std::max(size_t(support_enforce_layers), enforcers_layers.size()));
tbb::parallel_for(tbb::blocked_range<LayerIndex>(1, num_overhang_layers), tbb::parallel_for(tbb::blocked_range<LayerIndex>(1, num_overhang_layers),
[&print_object, &config, &print_config, &enforcers_layers, &blockers_layers, [&print_object, &config, &print_config, &enforcers_layers, &blockers_layers,
support_auto, support_enforce_layers, support_threshold_auto, tan_threshold, enforcer_overhang_offset, num_raft_layers, &throw_on_cancel, &out] support_auto, support_enforce_layers, support_threshold_auto, tan_threshold, enforcer_overhang_offset, num_raft_layers, radius_sample_resolution, &throw_on_cancel, &out]
(const tbb::blocked_range<LayerIndex> &range) { (const tbb::blocked_range<LayerIndex> &range) {
for (LayerIndex layer_id = range.begin(); layer_id < range.end(); ++ layer_id) { for (LayerIndex layer_id = range.begin(); layer_id < range.end(); ++ layer_id) {
const Layer &current_layer = *print_object.get_layer(layer_id); const Layer &current_layer = *print_object.get_layer(layer_id);
@ -264,12 +265,8 @@ static std::vector<std::pair<TreeSupportSettings, std::vector<size_t>>> group_me
raw_overhangs = overhangs; raw_overhangs = overhangs;
raw_overhangs_calculated = true; raw_overhangs_calculated = true;
} }
if (! (enforced_layer || blockers_layers.empty() || blockers_layers[layer_id].empty())) { if (! (enforced_layer || blockers_layers.empty() || blockers_layers[layer_id].empty()))
Polygons &blocker = blockers_layers[layer_id]; overhangs = diff(overhangs, offset_ex(union_(blockers_layers[layer_id]), scale_(radius_sample_resolution)), ApplySafetyOffset::Yes);
// Arthur: union_ is a must because after mirroring, the blocker polygons are in left-hand coordinates, ie clockwise,
// which are not valid polygons, and will be removed by offset. union_ can make these polygons right.
overhangs = diff(overhangs, offset(union_(blocker), scale_(g_config_tree_support_collision_resolution)), ApplySafetyOffset::Yes);
}
if (config.bridge_no_support) { if (config.bridge_no_support) {
for (const LayerRegion *layerm : current_layer.regions()) for (const LayerRegion *layerm : current_layer.regions())
remove_bridges_from_contacts(print_config, lower_layer, *layerm, remove_bridges_from_contacts(print_config, lower_layer, *layerm,