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

Connect infill to perimeters

Browse Source
This commit is contained in:
Lukáš Hejl 2020-09-03 13:05:28 +02:00
parent a3a1c20172
commit 353c65fa4c
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/libslic3r/Fill/FillAdaptive.cpp
View File

@ -3,6 +3,7 @@
#include "../Surface.hpp" #include "../Surface.hpp"
#include "../Geometry.hpp" #include "../Geometry.hpp"
#include "../AABBTreeIndirect.hpp" #include "../AABBTreeIndirect.hpp"
#include "../ShortestPath.hpp"
#include "FillAdaptive.hpp" #include "FillAdaptive.hpp"
@ -15,19 +16,47 @@ void FillAdaptive::_fill_surface_single(
ExPolygon &expolygon, ExPolygon &expolygon,
Polylines &polylines_out) Polylines &polylines_out)
{ {
// Store grouped lines by its direction (multiple of 120°)
std::vector<Lines> infill_lines_dir(3); std::vector<Lines> infill_lines_dir(3);
this->generate_infill_lines(this->adapt_fill_octree->root_cube.get(), this->z, this->adapt_fill_octree->origin, infill_lines_dir); this->generate_infill_lines(this->adapt_fill_octree->root_cube.get(), this->z, this->adapt_fill_octree->origin, infill_lines_dir);
Polylines all_polylines;
all_polylines.reserve(infill_lines_dir[0].size() * 3);
for (Lines &infill_lines : infill_lines_dir) for (Lines &infill_lines : infill_lines_dir)
{ {
for (const Line &line : infill_lines) for (const Line &line : infill_lines)
{ {
polylines_out.emplace_back(line.a, line.b); all_polylines.emplace_back(line.a, line.b);
} }
} }
if (params.dont_connect)
{
// Crop all polylines // Crop all polylines
polylines_out = intersection_pl(polylines_out, to_polygons(expolygon)); polylines_out = intersection_pl(all_polylines, to_polygons(expolygon));
}
else
{
// Crop all polylines
all_polylines = intersection_pl(all_polylines, to_polygons(expolygon));
Polylines boundary_polylines;
Polylines non_boundary_polylines;
for (const Polyline &polyline : all_polylines)
{
// connect_infill required all polylines to touch the boundary.
if(polyline.lines().size() == 1 && expolygon.has_boundary_point(polyline.lines().front().a) && expolygon.has_boundary_point(polyline.lines().front().b))
{
boundary_polylines.push_back(polyline);
} else {
non_boundary_polylines.push_back(polyline);
}
}
boundary_polylines = chain_polylines(boundary_polylines);
FillAdaptive::connect_infill(std::move(boundary_polylines), expolygon, polylines_out, this->spacing, params);
polylines_out.insert(polylines_out.end(), non_boundary_polylines.begin(), non_boundary_polylines.end());
}
#ifdef SLIC3R_DEBUG_SLICE_PROCESSING #ifdef SLIC3R_DEBUG_SLICE_PROCESSING
{ {