amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Refactor stagger concentric seams (#6432)

Browse source
This commit is contained in:
Vovodroid 2024-08-25 07:33:32 +03:00 committed by GitHub
parent a68fc86c4e
commit bd8c2ffaeb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/libslic3r/Fill/FillConcentric.cpp
View file

@ -10,12 +10,15 @@
namespace Slic3r { namespace Slic3r {
template<typename LINE_T> template<typename LINE_T>
int stagger_seam_index(int ind, LINE_T line) int stagger_seam_index(int ind, LINE_T line, double shift, bool dir)
{ {
Point const *point = &line.points[ind]; Point const *point = &line.points[ind];
double dist = 0; double dist = 0;
while (dist < 0.5 / SCALING_FACTOR) { while (dist < shift / SCALING_FACTOR) {
if (dir)
ind = (ind + 1) % line.points.size(); ind = (ind + 1) % line.points.size();
else
ind = ind > 0 ? --ind : line.points.size() - 1;
Point const &next = line.points[ind]; Point const &next = line.points[ind];
dist += point->distance_to(next); dist += point->distance_to(next);
point = &next; point = &next;
@ -23,6 +26,8 @@ int stagger_seam_index(int ind, LINE_T line)
return ind; return ind;
} }
#define STAGGER_SEAM_THRESHOLD 0.9
void FillConcentric::_fill_surface_single( void FillConcentric::_fill_surface_single(
const FillParams &params, const FillParams &params,
unsigned int thickness_layers, unsigned int thickness_layers,
@ -55,8 +60,20 @@ void FillConcentric::_fill_surface_single(
// split paths using a nearest neighbor search // split paths using a nearest neighbor search
size_t iPathFirst = polylines_out.size(); size_t iPathFirst = polylines_out.size();
Point last_pos(0, 0); Point last_pos(0, 0);
double min_nozzle_diameter;
bool dir;
if (this->print_config != nullptr && params.density >= STAGGER_SEAM_THRESHOLD) {
min_nozzle_diameter = *std::min_element(print_config->nozzle_diameter.values.begin(), print_config->nozzle_diameter.values.end());
dir = rand() % 2;
}
for (const Polygon &loop : loops) { for (const Polygon &loop : loops) {
polylines_out.emplace_back(loop.split_at_index(stagger_seam_index(last_pos.nearest_point_index(loop.points), loop))); int ind = (this->print_config != nullptr && params.density > STAGGER_SEAM_THRESHOLD) ?
stagger_seam_index(last_pos.nearest_point_index(loop.points), loop, min_nozzle_diameter / 2, dir) :
last_pos.nearest_point_index(loop.points);
polylines_out.emplace_back(loop.split_at_index(ind));
last_pos = polylines_out.back().last_point(); last_pos = polylines_out.back().last_point();
} }
@ -118,13 +135,18 @@ void FillConcentric::_fill_surface_single(const FillParams& params,
// Split paths using a nearest neighbor search. // Split paths using a nearest neighbor search.
size_t firts_poly_idx = thick_polylines_out.size(); size_t firts_poly_idx = thick_polylines_out.size();
Point last_pos(0, 0); Point last_pos(0, 0);
bool dir = rand() % 2;
for (const Arachne::ExtrusionLine* extrusion : all_extrusions) { for (const Arachne::ExtrusionLine* extrusion : all_extrusions) {
if (extrusion->empty()) if (extrusion->empty())
continue; continue;
ThickPolyline thick_polyline = Arachne::to_thick_polyline(*extrusion); ThickPolyline thick_polyline = Arachne::to_thick_polyline(*extrusion);
if (extrusion->is_closed)
thick_polyline.start_at_index(stagger_seam_index(last_pos.nearest_point_index(thick_polyline.points), thick_polyline)); if (extrusion->is_closed) {
int ind = (params.density >= STAGGER_SEAM_THRESHOLD) ?
stagger_seam_index(last_pos.nearest_point_index(thick_polyline.points), thick_polyline, min_nozzle_diameter / 2, dir) :
last_pos.nearest_point_index(thick_polyline.points);
thick_polyline.start_at_index(ind);
}
thick_polylines_out.emplace_back(std::move(thick_polyline)); thick_polylines_out.emplace_back(std::move(thick_polyline));
last_pos = thick_polylines_out.back().last_point(); last_pos = thick_polylines_out.back().last_point();
} }