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

Follow-up of 15c32d636d -> Small refactoring

Browse Source
This commit is contained in:
enricoturri1966 2021-05-04 13:31:07 +02:00
parent 15c32d636d
commit cb294e0b3e
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -2405,27 +2405,28 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line)
} }
#if ENABLE_SEAMS_VISUALIZATION #if ENABLE_SEAMS_VISUALIZATION
// check for seam starting vertex if (m_seams_detector.is_active()) {
if (type == EMoveType::Extrude && m_extrusion_role == erExternalPerimeter && m_seams_detector.is_active() && !m_seams_detector.has_first_vertex()) // check for seam starting vertex
m_seams_detector.set_first_vertex(m_result.moves.back().position - m_extruder_offsets[m_extruder_id]); if (type == EMoveType::Extrude && m_extrusion_role == erExternalPerimeter && !m_seams_detector.has_first_vertex())
// check for seam ending vertex and store the resulting move m_seams_detector.set_first_vertex(m_result.moves.back().position - m_extruder_offsets[m_extruder_id]);
else if ((type != EMoveType::Extrude || m_extrusion_role != erExternalPerimeter) && m_seams_detector.is_active() && m_seams_detector.has_first_vertex()) { // check for seam ending vertex and store the resulting move
auto set_end_position = [this](const Vec3f& pos) { else if ((type != EMoveType::Extrude || m_extrusion_role != erExternalPerimeter) && m_seams_detector.has_first_vertex()) {
m_end_position[X] = pos.x(); m_end_position[Y] = pos.y(); m_end_position[Z] = pos.z(); auto set_end_position = [this](const Vec3f& pos) {
}; m_end_position[X] = pos.x(); m_end_position[Y] = pos.y(); m_end_position[Z] = pos.z();
};
assert(m_seams_detector.has_first_vertex()); const Vec3f curr_pos(m_end_position[X], m_end_position[Y], m_end_position[Z]);
const Vec3f curr_pos(m_end_position[X], m_end_position[Y], m_end_position[Z]); const Vec3f new_pos = m_result.moves.back().position - m_extruder_offsets[m_extruder_id];
const Vec3f new_pos = m_result.moves.back().position - m_extruder_offsets[m_extruder_id]; const std::optional<Vec3f> first_vertex = m_seams_detector.get_first_vertex();
const std::optional<Vec3f> first_vertex = m_seams_detector.get_first_vertex(); // the threshold value = 0.0625f == 0.25 * 0.25 is arbitrary, we may find some smarter condition later
// the threshold value = 0.0625f == 0.25 * 0.25 is arbitrary, we may find some smarter condition later if ((new_pos - *first_vertex).squaredNorm() < 0.0625f) {
if ((new_pos - *first_vertex).squaredNorm() < 0.0625f) { set_end_position(0.5f * (new_pos + *first_vertex));
set_end_position(0.5f * (new_pos + *first_vertex)); store_move_vertex(EMoveType::Seam);
store_move_vertex(EMoveType::Seam); set_end_position(curr_pos);
set_end_position(curr_pos); }
m_seams_detector.activate(false);
} }
m_seams_detector.activate(false);
} }
#endif // ENABLE_SEAMS_VISUALIZATION #endif // ENABLE_SEAMS_VISUALIZATION