GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-11 05:41:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try routing unsuccessful branches to ground recursively

Browse Source 
This helps to avoid huge branches being discarded where there is an obvious route to ground for a sub-branch.
Should improve SPE-1311
This commit is contained in:
tamasmeszaros 2022-10-24 17:33:58 +02:00
parent 31fb0ae049
commit f5c1623642
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/BranchingTree/PointCloud.hpp
View File

@ -259,9 +259,9 @@ template<class PC, class Fn> void traverse(PC &&pc, size_t root, Fn &&fn)
{ {
if (auto nodeptr = pc.find(root); nodeptr != nullptr) { if (auto nodeptr = pc.find(root); nodeptr != nullptr) {
auto &nroot = *nodeptr; auto &nroot = *nodeptr;
fn(nroot); bool r = fn(nroot);
if (nroot.left >= 0) traverse(pc, nroot.left, fn); if (r && nroot.left >= 0) traverse(pc, nroot.left, fn);
if (nroot.right >= 0) traverse(pc, nroot.right, fn); if (r && nroot.right >= 0) traverse(pc, nroot.right, fn);
} }
} }

23
src/libslic3r/SLA/BranchingTreeSLA.cpp
View File

@ -61,22 +61,41 @@ class BranchingTreeBuilder: public branchingtree::Builder {
toR); toR);
m_builder.add_junction(tod, toR); m_builder.add_junction(tod, toR);
} }
return true;
}); });
} }
void discard_subtree(size_t root) void discard_subtree(size_t root)
{ {
// Discard all the support points connecting to this branch. // Discard all the support points connecting to this branch.
// As a last resort, try to route child nodes to ground and stop
// traversing if any child branch succeeds.
traverse(m_cloud, root, [this](const branchingtree::Node &node) { traverse(m_cloud, root, [this](const branchingtree::Node &node) {
bool ret = true;
int suppid_parent = m_cloud.get_leaf_id(node.id); int suppid_parent = m_cloud.get_leaf_id(node.id);
int suppid_left = m_cloud.get_leaf_id(node.left); int suppid_left = branchingtree::Node::ID_NONE;
int suppid_right = m_cloud.get_leaf_id(node.right); int suppid_right = branchingtree::Node::ID_NONE;
if (node.left >= 0 && add_ground_bridge(m_cloud.get(node.left), node))
ret = false;
else
suppid_left = m_cloud.get_leaf_id(node.left);
if (node.right >= 0 && add_ground_bridge(m_cloud.get(node.right), node))
ret = false;
else
suppid_right = m_cloud.get_leaf_id(node.right);
if (suppid_parent >= 0) if (suppid_parent >= 0)
m_unroutable_pinheads.emplace_back(suppid_parent); m_unroutable_pinheads.emplace_back(suppid_parent);
if (suppid_left >= 0) if (suppid_left >= 0)
m_unroutable_pinheads.emplace_back(suppid_left); m_unroutable_pinheads.emplace_back(suppid_left);
if (suppid_right >= 0) if (suppid_right >= 0)
m_unroutable_pinheads.emplace_back(suppid_right); m_unroutable_pinheads.emplace_back(suppid_right);
return ret;
}); });
} }