From b50aa3168515d23f536da4b3745deaacb2ba5a1e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 29 May 2024 16:59:38 +0200 Subject: [PATCH] Seam (potentially) not on vertex for walls. For certain seam-types (user-specified and shortest). This implements it for walls only. CURA-9474 --- include/InsetOrderOptimizer.h | 2 ++ src/InsetOrderOptimizer.cpp | 48 ++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/InsetOrderOptimizer.h b/include/InsetOrderOptimizer.h index f03a7fc461..d0e508fdd8 100644 --- a/include/InsetOrderOptimizer.h +++ b/include/InsetOrderOptimizer.h @@ -113,6 +113,8 @@ class InsetOrderOptimizer Shape retraction_region_; // After printing an outer wall, move into this region so that retractions do not leave visible blobs. Calculated lazily if needed (see // retraction_region_calculated). + void insertSeamPoint(ExtrusionLine& closed_line); + /*! * Determine if the paths should be reversed * If there is one extruder used, and we're currently printing the inner walls then Reversing the insets now depends on the inverse of diff --git a/src/InsetOrderOptimizer.cpp b/src/InsetOrderOptimizer.cpp index 7be4d8f6ba..91a8bd3a23 100644 --- a/src/InsetOrderOptimizer.cpp +++ b/src/InsetOrderOptimizer.cpp @@ -110,10 +110,11 @@ bool InsetOrderOptimizer::addToLayer() group_outer_walls, disallowed_areas_for_seams_); - for (const auto& line : walls_to_be_added) + for (auto& line : walls_to_be_added) { if (line.is_closed_) { + insertSeamPoint(line); order_optimizer.addPolygon(&line); } else @@ -164,6 +165,51 @@ bool InsetOrderOptimizer::addToLayer() return added_something; } +void InsetOrderOptimizer::insertSeamPoint(ExtrusionLine& closed_line) +{ + assert(closed_line.is_closed_); + + Point2LL request_point; + switch (z_seam_config_.type_) + { + case EZSeamType::USER_SPECIFIED: request_point = z_seam_config_.pos_; break; + case EZSeamType::SHORTEST: request_point = gcode_layer_.getLastPlannedPositionOrStartingPosition(); break; + default: return; + } + + size_t closest_junction_idx = 0; + coord_t closest_distance_sqd = std::numeric_limits::max(); + for (const auto& [i, junction] : closed_line.junctions_ | ranges::views::enumerate) + { + const coord_t distance_sqd = vSize2(junction.p_ - request_point); + if (distance_sqd < closest_distance_sqd) + { + closest_distance_sqd = distance_sqd; + closest_junction_idx = i; + } + } + + const auto& start_pt = closed_line.junctions_[closest_junction_idx]; + const auto& end_pt = closed_line.junctions_[(closest_junction_idx + 1) % closed_line.junctions_.size()]; + const auto closest_point = LinearAlg2D::getClosestOnLineSegment(request_point, start_pt.p_, end_pt.p_); + constexpr coord_t smallest_dist_sqd = 25; + if (vSize2(closest_point - start_pt.p_) <= smallest_dist_sqd || vSize2(closest_point - end_pt.p_) <= smallest_dist_sqd) + { + return; + } + + // NOTE: This could also be done on a single axis (skipping the implied sqrt), but figuring out which one and then using the right values became a bit messy/verbose. + const coord_t total_dist = vSize(end_pt.p_ - start_pt.p_); + const coord_t start_dist = vSize(closest_point - start_pt.p_); + const coord_t end_dist = vSize(closest_point - end_pt.p_); + const coord_t w = end_pt.w_ * end_dist / total_dist + start_pt.w_ * start_dist / total_dist; + + closed_line.junctions_.insert( + closed_line.junctions_.begin() + closest_junction_idx + 1, + ExtrusionJunction( closest_point, w, start_pt.perimeter_index_ ) + ); +} + InsetOrderOptimizer::value_type InsetOrderOptimizer::getRegionOrder(const std::vector& extrusion_lines, const bool outer_to_inner) { if (extrusion_lines.empty())