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

added support for multiple objects

Browse Source
This commit is contained in:
PavelMikus 2022-12-02 12:52:37 +01:00 committed by Pavel Mikuš
parent fc79717e48
commit 9d1ac71e55
2 changed files with 17 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/GCode.cpp
View File

@ -2169,12 +2169,9 @@ LayerResult GCode::process_layer(
} }
} }
std::vector<const Layer*> layers_ptrs;
layers_ptrs.reserve(layers.size());
for (const ObjectLayerToPrint &layer_to_print : layers) { for (const ObjectLayerToPrint &layer_to_print : layers) {
layers_ptrs.push_back(layer_to_print.object_layer); m_extrusion_quality_estimator.prepare_for_new_layer(layer_to_print.object_layer);
} }
m_extrusion_quality_estimator.prepare_for_new_layer(layers_ptrs);
// Extrude the skirt, brim, support, perimeters, infill ordered by the extruders. // Extrude the skirt, brim, support, perimeters, infill ordered by the extruders.
for (unsigned int extruder_id : layer_tools.extruders) for (unsigned int extruder_id : layer_tools.extruders)
@ -2303,6 +2300,8 @@ void GCode::process_layer_single_object(
const PrintObject &print_object = print_instance.print_object; const PrintObject &print_object = print_instance.print_object;
const Print &print = *print_object.print(); const Print &print = *print_object.print();
m_extrusion_quality_estimator.set_current_object(&print_object);
if (! print_wipe_extrusions && layer_to_print.support_layer != nullptr) if (! print_wipe_extrusions && layer_to_print.support_layer != nullptr)
if (const SupportLayer &support_layer = *layer_to_print.support_layer; ! support_layer.support_fills.entities.empty()) { if (const SupportLayer &support_layer = *layer_to_print.support_layer; ! support_layer.support_fills.entities.empty()) {
ExtrusionRole role = support_layer.support_fills.role(); ExtrusionRole role = support_layer.support_fills.role();

62
src/libslic3r/GCode/ExtrusionProcessor.hpp
View File

@ -18,6 +18,7 @@
#include <cstddef> #include <cstddef>
#include <limits> #include <limits>
#include <numeric> #include <numeric>
#include <unordered_map>
#include <vector> #include <vector>
namespace Slic3r { namespace Slic3r {
@ -95,59 +96,22 @@ struct ProcessedPoint
class ExtrusionQualityEstimator class ExtrusionQualityEstimator
{ {
AABBTreeLines::LinesDistancer<Linef> prev_layer_boundary; std::unordered_map<const PrintObject *, AABBTreeLines::LinesDistancer<Linef>> prev_layer_boundaries;
AABBTreeLines::LinesDistancer<Linef> next_layer_boundary; std::unordered_map<const PrintObject *, AABBTreeLines::LinesDistancer<Linef>> next_layer_boundaries;
CurvatureEstimator cestim; CurvatureEstimator cestim;
const PrintObject *current_object;
public: public:
void reset_for_next_extrusion() { cestim.reset(); } void reset_for_next_extrusion() { cestim.reset(); }
void prepare_for_new_layer(const std::vector<const Layer *> &layers) void set_current_object(const PrintObject *object) { current_object = object; }
void prepare_for_new_layer(const Layer *layer)
{ {
std::vector<Linef> layer_lines; if (layer == nullptr) return;
for (const Layer *layer : layers) { const PrintObject *object = layer->object();
if (layer == nullptr) continue; prev_layer_boundaries[object] = next_layer_boundaries[object];
std::vector<Linef> object_lines = to_unscaled_linesf(layer->lslices); next_layer_boundaries[object] = AABBTreeLines::LinesDistancer<Linef>{to_unscaled_linesf(layer->lslices)};
layer_lines.insert(layer_lines.end(), object_lines.begin(), object_lines.end());
}
prev_layer_boundary = next_layer_boundary;
next_layer_boundary = AABBTreeLines::LinesDistancer<Linef>{std::move(layer_lines)};
#if 0 // EXPORT DEBUG FILES
Lines scaled_lines;
for (const Linef &lf : layer_lines) { scaled_lines.push_back({Point::new_scale(lf.a), Point::new_scale(lf.b)}); }
BoundingBox bb = get_extents(scaled_lines);
Points inside;
for (const Layer *layer : layers) {
if (layer == nullptr) continue;
auto in = to_points(to_polygons(offset_ex(layer->lslices, -scale_(0.4))));
inside.insert(inside.end(), in.begin(), in.end());
}
::Slic3r::SVG svg(debug_out_path(("processing" + std::to_string(rand() % 1000)).c_str()).c_str(), bb);
svg.draw(scaled_lines, "black", scale_(0.10));
for (Point p : inside) {
auto [distance, line_idx, nearest_point] = next_layer_boundary.signed_distance_from_lines_extra(unscaled(p));
if (distance > 0) {
svg.draw(p, "red", scale_(0.2));
svg.draw(Point::new_scale(nearest_point.x(), nearest_point.y()), "blue", scale_(0.2));
auto li = next_layer_boundary.get_line(line_idx);
Line ls{Point::new_scale(li.a), Point::new_scale(li.b)};
svg.draw(ls, "yellow", scale_(0.2));
}
}
if (inside.size() > 0) {
Line line{inside[0], inside[inside.size() * 0.5]};
auto inters = next_layer_boundary.intersections_with_line<true>({unscaled(line.a), unscaled(line.b)});
svg.draw(line, "purple", scale_(0.15));
for (auto inter : inters) {
svg.draw(Point::new_scale(inter), "red", scale_(0.2));
}
}
#endif
} }
std::vector<ProcessedPoint> estimate_extrusion_quality(const ExtrusionPath &path) std::vector<ProcessedPoint> estimate_extrusion_quality(const ExtrusionPath &path)
@ -168,6 +132,8 @@ public:
const Points &original_points = path.polyline.points; const Points &original_points = path.polyline.points;
std::vector<ExtendedPoint> points; std::vector<ExtendedPoint> points;
const auto& prev_layer_boundary = prev_layer_boundaries[current_object];
float distance = prev_layer_boundary.signed_distance_from_lines(unscaled(original_points[0])) + 0.5 * flow_width; float distance = prev_layer_boundary.signed_distance_from_lines(unscaled(original_points[0])) + 0.5 * flow_width;
points.push_back({unscaled(original_points[0]), distance, 1.0f}); points.push_back({unscaled(original_points[0]), distance, 1.0f});
for (size_t i = 1; i < original_points.size(); i++) { for (size_t i = 1; i < original_points.size(); i++) {