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

Id-s put in a base class for support tree primitives

Browse source
This commit is contained in:
tamasmeszaros 2020-06-19 09:25:17 +02:00
parent 301a168b89
commit f19b3a2344
4 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libslic3r/SLA/SupportTreeBuildsteps.cpp
View file

@ -570,7 +570,7 @@ bool SupportTreeBuildsteps::create_ground_pillar(const Vec3d &jp,
long head_id)
{
double sd = m_cfg.pillar_base_safety_distance_mm;
long pillar_id = ID_UNSET;
long pillar_id = SupportTreeNode::ID_UNSET;
bool can_add_base = radius >= m_cfg.head_back_radius_mm;
double base_r = can_add_base ? m_cfg.base_radius_mm : 0.;
double gndlvl = m_builder.ground_level;
@ -1029,7 +1029,7 @@ bool SupportTreeBuildsteps::connect_to_ground(Head &head)
bool SupportTreeBuildsteps::connect_to_model_body(Head &head)
{
if (head.id <= ID_UNSET) return false;
if (head.id <= SupportTreeNode::ID_UNSET) return false;
auto it = m_head_to_ground_scans.find(unsigned(head.id));
if (it == m_head_to_ground_scans.end()) return false;
@ -1084,7 +1084,7 @@ bool SupportTreeBuildsteps::search_pillar_and_connect(const Head &source)
// We also need to remove elements progressively from the copied index.
PointIndex spindex = m_pillar_index.guarded_clone();
long nearest_id = ID_UNSET;
long nearest_id = SupportTreeNode::ID_UNSET;
Vec3d querypt = source.junction_point();
@ -1105,7 +1105,7 @@ bool SupportTreeBuildsteps::search_pillar_and_connect(const Head &source)
if (size_t(nearest_id) < m_builder.pillarcount()) {
if(!connect_to_nearpillar(source, nearest_id) ||
m_builder.pillar(nearest_id).r < source.r_back_mm) {
nearest_id = ID_UNSET; // continue searching
nearest_id = SupportTreeNode::ID_UNSET; // continue searching
spindex.remove(ne); // without the current pillar
}
}