GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 08:45:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#988 don't use the cost-based field in other seam algo.

Browse Source
This commit is contained in:
remi durand 2021-03-17 17:14:24 +01:00
parent e740aa6356
commit 662f0b0b38
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,6 +376,7 @@ Point SeamPlacer::get_seam(const Layer& layer, SeamPosition seam_position,
if (seam_position != spRandom) { if (seam_position != spRandom) {
// Retrieve the last start position for this object. // Retrieve the last start position for this object.
double travel_cost = 1;
if (seam_position == spAligned) { if (seam_position == spAligned) {
// Seam is aligned to the seam at the preceding layer. // Seam is aligned to the seam at the preceding layer.
if (po != nullptr) { if (po != nullptr) {
@ -391,6 +392,7 @@ Point SeamPlacer::get_seam(const Layer& layer, SeamPosition seam_position,
last_pos.x() = 0; last_pos.x() = 0;
last_pos.y() += coord_t(3. * po->bounding_box().radius()); last_pos.y() += coord_t(3. * po->bounding_box().radius());
last_pos_weight = 5.f; last_pos_weight = 5.f;
travel_cost = 0;
}else if (seam_position == spNearest) { }else if (seam_position == spNearest) {
// last_pos already contains current nozzle position // last_pos already contains current nozzle position
// set base last_pos_weight to the same value as penaltyFlatSurface // set base last_pos_weight to the same value as penaltyFlatSurface
@ -398,6 +400,7 @@ Point SeamPlacer::get_seam(const Layer& layer, SeamPosition seam_position,
if (po != nullptr) { if (po != nullptr) {
last_pos_weight = po->config().seam_travel_cost.get_abs_value(last_pos_weight); last_pos_weight = po->config().seam_travel_cost.get_abs_value(last_pos_weight);
angle_weight = po->config().seam_angle_cost.get_abs_value(angle_weight); angle_weight = po->config().seam_angle_cost.get_abs_value(angle_weight);
travel_cost = po->config().seam_travel_cost.get_abs_value(1);
} }
} }
@ -416,7 +419,7 @@ Point SeamPlacer::get_seam(const Layer& layer, SeamPosition seam_position,
//find the max dist the seam can be //find the max dist the seam can be
float dist_max = 0.1f * lengths.back();// 5.f * nozzle_dmr float dist_max = 0.1f * lengths.back();// 5.f * nozzle_dmr
if (po != nullptr && po->config().seam_travel_cost.get_abs_value(1) >= 1) { if (po != nullptr && travel_cost >= 1) {
last_pos_weight *= 2; last_pos_weight *= 2;
dist_max = 0; dist_max = 0;
for (size_t i = 0; i < polygon.points.size(); ++i) { for (size_t i = 0; i < polygon.points.size(); ++i) {
@ -456,7 +459,7 @@ Point SeamPlacer::get_seam(const Layer& layer, SeamPosition seam_position,
penalty = penaltyConvexVertex + (penaltyFlatSurface - penaltyConvexVertex) * bspline_kernel(ccwAngle); penalty = penaltyConvexVertex + (penaltyFlatSurface - penaltyConvexVertex) * bspline_kernel(ccwAngle);
} }
penalty *= angle_weight; penalty *= angle_weight;
if (po != nullptr && po->config().seam_travel_cost.get_abs_value(1) >= 1) { if (po != nullptr && travel_cost >= 1) {
penalty += last_pos_weight * polygon.points[i].distance_to(last_pos_proj) / dist_max; penalty += last_pos_weight * polygon.points[i].distance_to(last_pos_proj) / dist_max;
} else { } else {
// Give a negative penalty for points close to the last point or the prefered seam location. // Give a negative penalty for points close to the last point or the prefered seam location.