GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 23:06:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix weight calculation for fallback ground routing in branching tree

Browse Source
This commit is contained in:
tamasmeszaros 2022-10-25 13:37:05 +02:00
parent 1b54235d67
commit ba6b202aa4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,12 +78,16 @@ class BranchingTreeBuilder: public branchingtree::Builder {
int suppid_left = branchingtree::Node::ID_NONE; int suppid_left = branchingtree::Node::ID_NONE;
int suppid_right = branchingtree::Node::ID_NONE; int suppid_right = branchingtree::Node::ID_NONE;
if (node.left >= 0 && add_ground_bridge(m_cloud.get(node.left), node)) branchingtree::Node dst = node;
dst.weight += node.pos.z();
dst.Rmin = std::max(node.Rmin, dst.Rmin);
if (node.left >= 0 && add_ground_bridge(m_cloud.get(node.left), dst))
ret = false; ret = false;
else else
suppid_left = m_cloud.get_leaf_id(node.left); suppid_left = m_cloud.get_leaf_id(node.left);
if (node.right >= 0 && add_ground_bridge(m_cloud.get(node.right), node)) if (node.right >= 0 && add_ground_bridge(m_cloud.get(node.right), dst))
ret = false; ret = false;
else else
suppid_right = m_cloud.get_leaf_id(node.right); suppid_right = m_cloud.get_leaf_id(node.right);
@ -143,7 +147,7 @@ bool BranchingTreeBuilder::add_bridge(const branchingtree::Node &from,
double fromR = get_radius(from), toR = get_radius(to); double fromR = get_radius(from), toR = get_radius(to);
Beam beam{Ball{fromd, fromR}, Ball{tod, toR}}; Beam beam{Ball{fromd, fromR}, Ball{tod, toR}};
auto hit = beam_mesh_hit(ex_tbb, m_sm.emesh, beam, auto hit = beam_mesh_hit(ex_tbb, m_sm.emesh, beam,
m_sm.cfg.safety_distance_mm); 0.9 * m_sm.cfg.safety_distance_mm);
bool ret = hit.distance() > (tod - fromd).norm(); bool ret = hit.distance() > (tod - fromd).norm();