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

bug fix in point insertion calculation

Browse Source
This commit is contained in:
PavelMikus 2022-12-14 14:42:36 +01:00 committed by Pavel Mikuš
parent 9bf7ce5e28
commit a439590c1d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libslic3r/GCode/ExtrusionProcessor.hpp
View File

@ -148,7 +148,7 @@ std::vector<ExtendedPoint> estimate_points_properties(const std::vector<P>
const ExtendedPoint &curr = points[point_idx]; const ExtendedPoint &curr = points[point_idx];
const ExtendedPoint &next = points[point_idx + 1]; const ExtendedPoint &next = points[point_idx + 1];
if ((curr.distance > 0 && curr.distance < boundary_offset + 2.0f) && if ((curr.distance > 0 && curr.distance < boundary_offset + 2.0f) ||
(next.distance > 0 && next.distance < boundary_offset + 2.0f)) { (next.distance > 0 && next.distance < boundary_offset + 2.0f)) {
double line_len = (next.position - curr.position).norm(); double line_len = (next.position - curr.position).norm();
if (line_len > 4.0f) { if (line_len > 4.0f) {
@ -157,13 +157,16 @@ std::vector<ExtendedPoint> estimate_points_properties(const std::vector<P>
double t0 = std::min(a0, a1); double t0 = std::min(a0, a1);
double t1 = std::max(a0, a1); double t1 = std::max(a0, a1);
auto p0 = curr.position + t0 * (next.position - curr.position); if (t0 < 1.0) {
auto [p0_dist, p0_near_l, p0_x] = unscaled_prev_layer.signed_distance_from_lines_extra(p0); auto p0 = curr.position + t0 * (next.position - curr.position);
new_points.push_back(ExtendedPoint{p0, float(p0_dist + boundary_offset), p0_near_l}); auto [p0_dist, p0_near_l, p0_x] = unscaled_prev_layer.signed_distance_from_lines_extra(p0);
new_points.push_back(ExtendedPoint{p0, float(p0_dist + boundary_offset), p0_near_l});
auto p1 = curr.position + t1 * (next.position - curr.position); }
auto [p1_dist, p1_near_l, p1_x] = unscaled_prev_layer.signed_distance_from_lines_extra(p1); if (t1 > 0.0) {
new_points.push_back(ExtendedPoint{p1, float(p1_dist + boundary_offset), p1_near_l}); auto p1 = curr.position + t1 * (next.position - curr.position);
auto [p1_dist, p1_near_l, p1_x] = unscaled_prev_layer.signed_distance_from_lines_extra(p1);
new_points.push_back(ExtendedPoint{p1, float(p1_dist + boundary_offset), p1_near_l});
}
} }
} }
new_points.push_back(next); new_points.push_back(next);