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

Increase visibility info importance, since the visibility info is now much more reliable

Browse Source
This commit is contained in:
PavelMikus 2022-05-16 09:56:58 +02:00
parent f1b4a187b6
commit 5796515322
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,11 +705,11 @@ struct SeamComparator {
} }
// the penalites are kept close to range [0-1.x] however, it should not be relied upon // the penalites are kept close to range [0-1.x] however, it should not be relied upon
float penalty_a = (a.visibility + SeamPlacer::additional_angle_importance) float penalty_a = a.visibility +
* compute_angle_penalty(a.local_ccw_angle) SeamPlacer::angle_importance * compute_angle_penalty(a.local_ccw_angle)
+ distance_penalty_a; + distance_penalty_a;
float penalty_b = (b.visibility + SeamPlacer::additional_angle_importance) float penalty_b = b.visibility +
* compute_angle_penalty(b.local_ccw_angle) SeamPlacer::angle_importance * compute_angle_penalty(b.local_ccw_angle)
+ distance_penalty_b; + distance_penalty_b;
return penalty_a < penalty_b; return penalty_a < penalty_b;
@ -762,10 +762,10 @@ struct SeamComparator {
} }
//ranges: [0 - 1] (0 - 1.3] ; //ranges: [0 - 1] (0 - 1.3] ;
float penalty_a = (a.visibility + SeamPlacer::additional_angle_importance) float penalty_a = a.visibility
* compute_angle_penalty(a.local_ccw_angle); + SeamPlacer::angle_importance * compute_angle_penalty(a.local_ccw_angle);
float penalty_b = (b.visibility + SeamPlacer::additional_angle_importance) float penalty_b = b.visibility +
* compute_angle_penalty(b.local_ccw_angle); SeamPlacer::angle_importance * compute_angle_penalty(b.local_ccw_angle);
return penalty_a <= penalty_b || penalty_a - penalty_b < SeamPlacer::seam_align_score_tolerance; return penalty_a <= penalty_b || penalty_a - penalty_b < SeamPlacer::seam_align_score_tolerance;
} }

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

@ -121,8 +121,8 @@ public:
// arm length used during angles computation // arm length used during angles computation
static constexpr float polygon_local_angles_arm_distance = 0.1f; static constexpr float polygon_local_angles_arm_distance = 0.1f;
// increases angle importance at the cost of deacreasing visibility info importance. must be > 0 // determines angle importance compared to visibility ( neutral value is 1.0f. )
static constexpr float additional_angle_importance = 0.1f; static constexpr float angle_importance = 0.7f;
// If enforcer or blocker is closer to the seam candidate than this limit, the seam candidate is set to Blocker or Enforcer // If enforcer or blocker is closer to the seam candidate than this limit, the seam candidate is set to Blocker or Enforcer
static constexpr float enforcer_blocker_distance_tolerance = 0.35f; static constexpr float enforcer_blocker_distance_tolerance = 0.35f;