GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-21 20:04:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes in the linear regression

Browse Source
This commit is contained in:
Pavel Mikus 2022-07-06 10:32:05 +02:00
parent fec3afa490
commit feeb9b2b1b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libslic3r/GCode/SeamPlacer.cpp
View File

@ -1210,7 +1210,7 @@ std::vector<std::pair<size_t, size_t>> SeamPlacer::find_seam_string(const PrintO
int next_layer = layer_idx + 1; int next_layer = layer_idx + 1;
std::pair<size_t, size_t> prev_point_index = start_seam; std::pair<size_t, size_t> prev_point_index = start_seam;
std::vector<std::pair<size_t, size_t>> seam_string { start_seam }; std::vector<std::pair<size_t, size_t>> seam_string { start_seam };
Vec3f surface_line_dir { 0.0f, 0.0f, 1.0f }; Vec3f surface_line_dir { 0.0f, 0.0f, 20.0f };
Vec3f origin_position = layers[start_seam.first].points[start_seam.second].position; Vec3f origin_position = layers[start_seam.first].points[start_seam.second].position;
//find seams or potential seams in forward direction; there is a budget of skips allowed //find seams or potential seams in forward direction; there is a budget of skips allowed
@ -1219,7 +1219,7 @@ std::vector<std::pair<size_t, size_t>> SeamPlacer::find_seam_string(const PrintO
float z_distance = float(po->get_layer(next_layer)->slice_z) - origin_position.z(); float z_distance = float(po->get_layer(next_layer)->slice_z) - origin_position.z();
float max_distance = SeamPlacer::seam_align_tolerable_dist; float max_distance = SeamPlacer::seam_align_tolerable_dist;
if (fabs(next_layer - layer_idx) >= SeamPlacer::seam_align_min_seams_for_linear_projection){ if (fabs(next_layer - layer_idx) >= SeamPlacer::seam_align_min_seams_for_linear_projection){
Vec3f projected_position = origin_position + z_distance * surface_line_dir; Vec3f projected_position = origin_position + z_distance * (surface_line_dir / surface_line_dir.z());
maybe_next_seam = find_next_seam_in_layer(layers, projected_position, next_layer, max_distance, maybe_next_seam = find_next_seam_in_layer(layers, projected_position, next_layer, max_distance,
comparator); comparator);
} }
@ -1286,7 +1286,7 @@ std::vector<std::pair<size_t, size_t>> SeamPlacer::find_seam_string(const PrintO
seam_string.push_back(maybe_next_seam.operator*()); seam_string.push_back(maybe_next_seam.operator*());
prev_point_index = seam_string.back(); prev_point_index = seam_string.back();
//String added, prev_point_index updated //String added, prev_point_index updated
surface_line_dir += (next_seam.position - origin_position).normalized(); surface_line_dir -= (next_seam.position - origin_position).normalized();
} else { } else {
break; break;
} }

2
src/libslic3r/GCode/SeamPlacer.hpp
View File

@ -147,7 +147,7 @@ public:
// following value describes, how much worse score can point have and still be picked into seam cluster instead of original seam point on the same layer // following value describes, how much worse score can point have and still be picked into seam cluster instead of original seam point on the same layer
static constexpr float seam_align_score_tolerance = 0.3f; static constexpr float seam_align_score_tolerance = 0.3f;
// seam_align_tolerable_dist - if next layer closest point is too far away, break aligned string // seam_align_tolerable_dist - if next layer closest point is too far away, break aligned string
static constexpr float seam_align_tolerable_dist = 3.0f; static constexpr float seam_align_tolerable_dist = 1.5f;
// minimum number of seams needed in cluster to make alignment happen // minimum number of seams needed in cluster to make alignment happen
static constexpr size_t seam_align_minimum_string_seams = 6; static constexpr size_t seam_align_minimum_string_seams = 6;
// millimeters covered by spline; determines number of splines for the given string // millimeters covered by spline; determines number of splines for the given string