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

Revert "Reduce curling of Rear seams, improve its quality":

Browse source 
This reverts commit 1377aa5a7e.
The problem that this commit solves is already solved in
a better way in 2.6.0-alpha2
This commit is contained in:
Lukas Matena 2023-02-27 21:58:51 +01:00
parent 1377aa5a7e
commit 776edb9276
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libslic3r/GCode/SeamPlacer.cpp
View file

@ -1,7 +1,5 @@
#include "SeamPlacer.hpp" #include "SeamPlacer.hpp"
#include "Point.hpp"
#include "libslic3r.h"
#include "tbb/parallel_for.h" #include "tbb/parallel_for.h"
#include "tbb/blocked_range.h" #include "tbb/blocked_range.h"
#include "tbb/parallel_reduce.h" #include "tbb/parallel_reduce.h"
@ -752,9 +750,8 @@ void gather_enforcers_blockers(GlobalModelInfo &result, const PrintObject *po) {
struct SeamComparator { struct SeamComparator {
SeamPosition setup; SeamPosition setup;
float angle_importance; float angle_importance;
Vec2f rear_attractor; explicit SeamComparator(SeamPosition setup) :
explicit SeamComparator(SeamPosition setup, const Vec2f& rear_attractor = Vec2f::Zero()) : setup(setup) {
setup(setup), rear_attractor(rear_attractor) {
angle_importance = angle_importance =
setup == spNearest ? SeamPlacer::angle_importance_nearest : SeamPlacer::angle_importance_aligned; setup == spNearest ? SeamPlacer::angle_importance_nearest : SeamPlacer::angle_importance_aligned;
} }
@ -785,9 +782,8 @@ struct SeamComparator {
return false; return false;
} }
if (setup == SeamPosition::spRear) { if (setup == SeamPosition::spRear && a.position.y() != b.position.y()) {
return (a.position.head<2>() - rear_attractor).squaredNorm() < return a.position.y() > b.position.y();
(b.position.head<2>() - rear_attractor).squaredNorm();
} }
float distance_penalty_a = 0.0f; float distance_penalty_a = 0.0f;
@ -849,8 +845,7 @@ struct SeamComparator {
} }
if (setup == SeamPosition::spRear) { if (setup == SeamPosition::spRear) {
return (a.position.head<2>() - rear_attractor).squaredNorm() - a.perimeter.flow_width < return a.position.y() + SeamPlacer::seam_align_score_tolerance * 5.0f > b.position.y();
(b.position.head<2>() - rear_attractor).squaredNorm();
} }
float penalty_a = a.overhang + a.visibility float penalty_a = a.overhang + a.visibility
@ -1479,9 +1474,7 @@ void SeamPlacer::init(const Print &print, std::function<void(void)> throw_if_can
for (const PrintObject *po : print.objects()) { for (const PrintObject *po : print.objects()) {
throw_if_canceled_func(); throw_if_canceled_func();
SeamPosition configured_seam_preference = po->config().seam_position.value; SeamPosition configured_seam_preference = po->config().seam_position.value;
Vec2f rear_attractor = unscaled(po->bounding_box().center()).cast<float>() + SeamComparator comparator { configured_seam_preference };
1.5f * Vec2f(0.0f, unscale<float>(po->bounding_box().max.y()));
SeamComparator comparator{configured_seam_preference, rear_attractor};
{ {
GlobalModelInfo global_model_info { }; GlobalModelInfo global_model_info { };