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

FIX: bring back Tree Strong style

Browse source 
Tree Strong is too similar to Tree Slim and people don't like it.

Jira: STUDIO-2660
Github: #1579
Change-Id: I52d7e8e674f0fc332e4ab2813261ffbc4b4cfb7a
(cherry picked from commit 9eb209b4c1737d2f10b9b8bd78c9f876f3d32bce)
This commit is contained in:
Arthur 2023-04-12 20:23:00 +08:00 • committed by Lane.Wei
parent e2e1357ff7
commit 1d4a25ed20
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libslic3r/TreeSupport.cpp
View file

@ -688,6 +688,7 @@ TreeSupport::TreeSupport(PrintObject& object, const SlicingParameters &slicing_p
(m_support_params.interface_density > 0.95 ? ipRectilinear : ipSupportBase); (m_support_params.interface_density > 0.95 ? ipRectilinear : ipSupportBase);
m_support_params.support_extrusion_width = m_object_config->support_line_width.value > 0 ? m_object_config->support_line_width : m_object_config->line_width; m_support_params.support_extrusion_width = m_object_config->support_line_width.value > 0 ? m_object_config->support_line_width : m_object_config->line_width;
is_slim = is_tree_slim(support_type, support_style); is_slim = is_tree_slim(support_type, support_style);
is_strong = is_tree(support_type) && support_style == smsTreeStrong;
MAX_BRANCH_RADIUS = 10.0; MAX_BRANCH_RADIUS = 10.0;
tree_support_branch_diameter_angle = 5.0;//is_slim ? 10.0 : 5.0; tree_support_branch_diameter_angle = 5.0;//is_slim ? 10.0 : 5.0;
// by default tree support needs no infill, unless it's tree hybrid which contains normal nodes. // by default tree support needs no infill, unless it's tree hybrid which contains normal nodes.
@ -2824,13 +2825,13 @@ void TreeSupport::drop_nodes(std::vector<std::vector<Node*>>& contact_nodes)
if (is_line_cut_by_contour(node.position, neighbour)) continue; if (is_line_cut_by_contour(node.position, neighbour)) continue;
if (/*is_slim*/1) if (!is_strong)
sum_direction += direction * (1 / dist2_to_neighbor); sum_direction += direction * (1 / dist2_to_neighbor);
else else
sum_direction += direction; sum_direction += direction;
} }
if (/*is_slim*/1) if (!is_strong)
move_to_neighbor_center = sum_direction; move_to_neighbor_center = sum_direction;
else { else {
if (vsize2_with_unscale(sum_direction) <= max_move_distance2) { if (vsize2_with_unscale(sum_direction) <= max_move_distance2) {
@ -2872,7 +2873,7 @@ void TreeSupport::drop_nodes(std::vector<std::vector<Node*>>& contact_nodes)
} }
// move to the averaged direction of neighbor center and contour edge if they are roughly same direction // move to the averaged direction of neighbor center and contour edge if they are roughly same direction
Point movement; Point movement;
if (/*is_slim*/1) if (!is_strong)
movement = move_to_neighbor_center*2 + (dist2_to_outer > EPSILON ? direction_to_outer * (1 / dist2_to_outer) : Point(0, 0)); movement = move_to_neighbor_center*2 + (dist2_to_outer > EPSILON ? direction_to_outer * (1 / dist2_to_outer) : Point(0, 0));
else { else {
if (movement.dot(move_to_neighbor_center) >= 0.2 || move_to_neighbor_center == Point(0, 0)) if (movement.dot(move_to_neighbor_center) >= 0.2 || move_to_neighbor_center == Point(0, 0))

1
src/libslic3r/TreeSupport.hpp
View file

@ -407,6 +407,7 @@ private:
coordf_t MAX_BRANCH_RADIUS = 10.0; coordf_t MAX_BRANCH_RADIUS = 10.0;
coordf_t MIN_BRANCH_RADIUS = 0.5; coordf_t MIN_BRANCH_RADIUS = 0.5;
float tree_support_branch_diameter_angle = 5.0; float tree_support_branch_diameter_angle = 5.0;
bool is_strong = false;
bool is_slim = false; bool is_slim = false;
bool with_infill = false; bool with_infill = false;