3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix creation of unchecked diffbridge in branching tree

Browse Source
This commit is contained in:
tamasmeszaros 2022-05-17 11:58:59 +02:00
parent 0a3b17f940
commit 792779f2de
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,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,
2 * m_sm.cfg.safety_distance_mm); m_sm.cfg.head_back_radius_mm);
bool ret = hit.distance() > (tod - fromd).norm(); bool ret = hit.distance() > (tod - fromd).norm();
@ -141,7 +141,7 @@ bool BranchingTreeBuilder::add_merger(const branchingtree::Node &node,
Beam beam1{Ball{from1d, nodeR}, Ball{tod, mergeR}}; Beam beam1{Ball{from1d, nodeR}, Ball{tod, mergeR}};
Beam beam2{Ball{from2d, closestR}, Ball{tod, mergeR}}; Beam beam2{Ball{from2d, closestR}, Ball{tod, mergeR}};
auto sd = 2 * m_sm.cfg.safety_distance_mm; auto sd = m_sm.cfg.safety_distance_mm ;
auto hit1 = beam_mesh_hit(ex_tbb, m_sm.emesh, beam1, sd); auto hit1 = beam_mesh_hit(ex_tbb, m_sm.emesh, beam1, sd);
auto hit2 = beam_mesh_hit(ex_tbb, m_sm.emesh, beam2, sd); auto hit2 = beam_mesh_hit(ex_tbb, m_sm.emesh, beam2, sd);
@ -175,15 +175,20 @@ bool BranchingTreeBuilder::add_mesh_bridge(const branchingtree::Node &from,
fromj, fromj,
to.pos.cast<double>()); to.pos.cast<double>());
sla::Junction toj = {anchor->junction_point(), anchor->r_back_mm};
if (anchor) { if (anchor) {
m_builder.add_diffbridge(fromj.pos, anchor->junction_point(), fromj.r, auto hit1 = beam_mesh_hit(ex_tbb, m_sm.emesh,
anchor->r_back_mm); Beam{{fromj.pos, fromj.r}, {toj.pos, toj.r}},
m_sm.cfg.safety_distance_mm);
if (hit1.distance() >= distance(fromj.pos, toj.pos)) {
m_builder.add_diffbridge(fromj.pos, toj.pos, fromj.r, toj.r);
if (!m_sm.cfg.ground_facing_only) { // Easter egg, to omit the anchors if (!m_sm.cfg.ground_facing_only) { // Easter egg, to omit the anchors
m_builder.add_anchor(*anchor); m_builder.add_anchor(*anchor);
}
build_subtree(from.id);
} }
build_subtree(from.id);
} }
return bool(anchor); return bool(anchor);