mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-07 23:17:35 -06:00
aab8a12801
ConcentricGapFill pattern was used for internal narrow solid infill. Use arachne engine instead to remove gap fill inside the pattern and improve the extrusion path Signed-off-by: salt.wei <salt.wei@bambulab.com> Change-Id: I758d7c72eb71cc37026b7cebf746cc345014c3f5 (cherry picked from commit 0b6bacd21a091afc13d7b36a69e5b10f155bc6f8)
101 lines
4.5 KiB
C++
101 lines
4.5 KiB
C++
#include "../ClipperUtils.hpp"
|
|
#include "../ExPolygon.hpp"
|
|
#include "../Surface.hpp"
|
|
#include "../VariableWidth.hpp"
|
|
#include "Arachne/WallToolPaths.hpp"
|
|
|
|
#include "FillConcentricInternal.hpp"
|
|
|
|
namespace Slic3r {
|
|
|
|
void FillConcentricInternal::fill_surface_extrusion(const Surface* surface, const FillParams& params, ExtrusionEntitiesPtr& out)
|
|
{
|
|
assert(this->print_config != nullptr && this->print_object_config != nullptr);
|
|
|
|
ThickPolylines thick_polylines_out;
|
|
|
|
for (size_t i = 0; i < this->no_overlap_expolygons.size(); ++i) {
|
|
ExPolygon &expolygon = this->no_overlap_expolygons[i];
|
|
|
|
// no rotation is supported for this infill pattern
|
|
Point bbox_size = expolygon.contour.bounding_box().size();
|
|
coord_t min_spacing = params.flow.scaled_spacing();
|
|
|
|
coord_t loops_count = std::max(bbox_size.x(), bbox_size.y()) / min_spacing + 1;
|
|
Polygons polygons = offset(expolygon, 0);
|
|
|
|
double min_nozzle_diameter = *std::min_element(print_config->nozzle_diameter.values.begin(), print_config->nozzle_diameter.values.end());
|
|
Arachne::WallToolPathsParams input_params;
|
|
input_params.min_bead_width = 0.85 * min_nozzle_diameter;
|
|
input_params.min_feature_size = 0.1;
|
|
input_params.wall_transition_length = 0.4;
|
|
input_params.wall_transition_angle = 10;
|
|
input_params.wall_transition_filter_deviation = 0.25 * min_nozzle_diameter;
|
|
input_params.wall_distribution_count = 1;
|
|
input_params.wall_add_middle_threshold = 0.75;
|
|
input_params.wall_split_middle_threshold = 0.5;
|
|
|
|
Arachne::WallToolPaths wallToolPaths(polygons, min_spacing, min_spacing, loops_count, 0, input_params);
|
|
|
|
std::vector<Arachne::VariableWidthLines> loops = wallToolPaths.getToolPaths();
|
|
std::vector<const Arachne::ExtrusionLine*> all_extrusions;
|
|
for (Arachne::VariableWidthLines& loop : loops) {
|
|
if (loop.empty())
|
|
continue;
|
|
for (const Arachne::ExtrusionLine& wall : loop)
|
|
all_extrusions.emplace_back(&wall);
|
|
}
|
|
|
|
// Split paths using a nearest neighbor search.
|
|
size_t firts_poly_idx = thick_polylines_out.size();
|
|
Point last_pos(0, 0);
|
|
for (const Arachne::ExtrusionLine* extrusion : all_extrusions) {
|
|
if (extrusion->empty())
|
|
continue;
|
|
|
|
ThickPolyline thick_polyline = Arachne::to_thick_polyline(*extrusion);
|
|
if (extrusion->is_closed && thick_polyline.points.front() == thick_polyline.points.back() && thick_polyline.width.front() == thick_polyline.width.back()) {
|
|
thick_polyline.points.pop_back();
|
|
assert(thick_polyline.points.size() * 2 == thick_polyline.width.size());
|
|
int nearest_idx = last_pos.nearest_point_index(thick_polyline.points);
|
|
std::rotate(thick_polyline.points.begin(), thick_polyline.points.begin() + nearest_idx, thick_polyline.points.end());
|
|
std::rotate(thick_polyline.width.begin(), thick_polyline.width.begin() + 2 * nearest_idx, thick_polyline.width.end());
|
|
thick_polyline.points.emplace_back(thick_polyline.points.front());
|
|
}
|
|
thick_polylines_out.emplace_back(std::move(thick_polyline));
|
|
}
|
|
|
|
// clip the paths to prevent the extruder from getting exactly on the first point of the loop
|
|
// Keep valid paths only.
|
|
size_t j = firts_poly_idx;
|
|
for (size_t i = firts_poly_idx; i < thick_polylines_out.size(); ++i) {
|
|
thick_polylines_out[i].clip_end(this->loop_clipping);
|
|
if (thick_polylines_out[i].is_valid()) {
|
|
if (j < i)
|
|
thick_polylines_out[j] = std::move(thick_polylines_out[i]);
|
|
++j;
|
|
}
|
|
}
|
|
if (j < thick_polylines_out.size())
|
|
thick_polylines_out.erase(thick_polylines_out.begin() + int(j), thick_polylines_out.end());
|
|
}
|
|
|
|
ExtrusionEntityCollection *coll_nosort = new ExtrusionEntityCollection();
|
|
coll_nosort->no_sort = this->no_sort(); //can be sorted inside the pass
|
|
|
|
if (!thick_polylines_out.empty()) {
|
|
Flow new_flow = params.flow.with_spacing(float(this->spacing));
|
|
ExtrusionEntityCollection gap_fill;
|
|
variable_width(thick_polylines_out, params.extrusion_role, new_flow, gap_fill.entities);
|
|
coll_nosort->append(std::move(gap_fill.entities));
|
|
}
|
|
|
|
if (!coll_nosort->entities.empty())
|
|
out.push_back(coll_nosort);
|
|
else
|
|
delete coll_nosort;
|
|
|
|
}
|
|
|
|
|
|
} // namespace Slic3r
|