mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH: improve first layer tree support 

First layer support can't be top interface, and
min brim width of auto mode should be larger
than 0.

Jira: STUDIO-5010
Change-Id: I02f8b017b535f8a47965387e8679f692b1966e04
(cherry picked from commit 3e7d54abe352e8ab5f9d6492b5a86a96f9067f94)
This commit is contained in:
Arthur 2023-10-31 10:33:42 +08:00 committed by Lane.Wei
parent 16881dfb3f
commit 7efebe6bc6
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libslic3r/Support/TreeSupport.cpp
View File

@ -2273,7 +2273,7 @@ void TreeSupport::draw_circles(const std::vector<std::vector<Node*>>& contact_no
} }
} }
if (layer_nr == 0 && m_raft_layers == 0) { if (layer_nr == 0 && m_raft_layers == 0) {
double brim_width = tree_brim_width > 0 ? tree_brim_width : std::max(0.0, std::min(node.radius + node.dist_mm_to_top / (scale * branch_radius) * 0.5, MAX_BRANCH_RADIUS_FIRST_LAYER) - node.radius); double brim_width = tree_brim_width > 0 ? tree_brim_width : std::max(MIN_BRANCH_RADIUS_FIRST_LAYER, std::min(node.radius + node.dist_mm_to_top / (scale * branch_radius) * 0.5, MAX_BRANCH_RADIUS_FIRST_LAYER) - node.radius);
auto tmp=offset(circle, scale_(brim_width)); auto tmp=offset(circle, scale_(brim_width));
if(!tmp.empty()) if(!tmp.empty())
circle = tmp[0]; circle = tmp[0];
@ -2296,14 +2296,14 @@ void TreeSupport::draw_circles(const std::vector<std::vector<Node*>>& contact_no
need_extra_wall = true; need_extra_wall = true;
} }
if (node.distance_to_top < 0) if (layer_nr>0 && node.distance_to_top < 0)
append(roof_gap_areas, area); append(roof_gap_areas, area);
else if (node.support_roof_layers_below == 1) else if (layer_nr > 0 && node.support_roof_layers_below == 1)
{ {
append(roof_1st_layer, area); append(roof_1st_layer, area);
max_layers_above_roof1 = std::max(max_layers_above_roof1, node.dist_mm_to_top); max_layers_above_roof1 = std::max(max_layers_above_roof1, node.dist_mm_to_top);
} }
else if (node.support_roof_layers_below > 0) else if (layer_nr > 0 && node.support_roof_layers_below > 0)
{ {
append(roof_areas, area); append(roof_areas, area);
max_layers_above_roof = std::max(max_layers_above_roof, node.dist_mm_to_top); max_layers_above_roof = std::max(max_layers_above_roof, node.dist_mm_to_top);

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

@ -433,8 +433,9 @@ private:
std::vector< std::unordered_map<Line, bool, LineHash>> m_mst_line_x_layer_contour_caches; std::vector< std::unordered_map<Line, bool, LineHash>> m_mst_line_x_layer_contour_caches;
float DO_NOT_MOVER_UNDER_MM = 0.0; float DO_NOT_MOVER_UNDER_MM = 0.0;
coordf_t MAX_BRANCH_RADIUS = 10.0; coordf_t MAX_BRANCH_RADIUS = 10.0;
coordf_t MAX_BRANCH_RADIUS_FIRST_LAYER = 12.0;
coordf_t MIN_BRANCH_RADIUS = 0.5; coordf_t MIN_BRANCH_RADIUS = 0.5;
coordf_t MAX_BRANCH_RADIUS_FIRST_LAYER = 12.0;
coordf_t MIN_BRANCH_RADIUS_FIRST_LAYER = 2.0;
float tree_support_branch_diameter_angle = 5.0; float tree_support_branch_diameter_angle = 5.0;
coord_t m_min_radius = scale_(1); // in mm coord_t m_min_radius = scale_(1); // in mm
bool is_strong = false; bool is_strong = false;