3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactoring of AvoidCrossingPerimeters::init_external_mp()

Browse source
This commit is contained in:
bubnikv 2019-08-25 09:01:01 +02:00
parent ceae7b4889
commit de43f579a9
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libslic3r/GCode.cpp
View file

@ -50,7 +50,12 @@ static inline void check_add_eol(std::string &gcode)
if (! gcode.empty() && gcode.back() != '\n') if (! gcode.empty() && gcode.back() != '\n')
gcode += '\n'; gcode += '\n';
} }
void AvoidCrossingPerimeters::init_external_mp(const Print &print)
{
m_external_mp = Slic3r::make_unique<MotionPlanner>(union_ex(this->collect_contours_all_layers(print.objects())));
}
// Plan a travel move while minimizing the number of perimeter crossings. // Plan a travel move while minimizing the number of perimeter crossings.
// point is in unscaled coordinates, in the coordinate system of the current active object // point is in unscaled coordinates, in the coordinate system of the current active object
// (set by gcodegen.set_origin()). // (set by gcodegen.set_origin()).
@ -70,7 +75,7 @@ Polyline AvoidCrossingPerimeters::travel_to(const GCode &gcodegen, const Point &
// Collect outer contours of all objects over all layers. // Collect outer contours of all objects over all layers.
// Discard objects only containing thin walls (offset would fail on an empty polygon). // Discard objects only containing thin walls (offset would fail on an empty polygon).
// Used by avoid crossing perimeters feature. // Used by avoid crossing perimeters feature.
static Polygons collect_contours_all_layers(const PrintObjectPtrs& objects) Polygons AvoidCrossingPerimeters::collect_contours_all_layers(const PrintObjectPtrs& objects)
{ {
Polygons islands; Polygons islands;
for (const PrintObject *object : objects) { for (const PrintObject *object : objects) {
@ -80,8 +85,8 @@ static Polygons collect_contours_all_layers(const PrintObjectPtrs& objects)
tbb::parallel_for(tbb::blocked_range<size_t>(0, object->layers().size() / 2), tbb::parallel_for(tbb::blocked_range<size_t>(0, object->layers().size() / 2),
[&object, &polygons_per_layer](const tbb::blocked_range<size_t> &range) { [&object, &polygons_per_layer](const tbb::blocked_range<size_t> &range) {
for (size_t i = range.begin(); i < range.end(); ++ i) { for (size_t i = range.begin(); i < range.end(); ++ i) {
const Layer* layer1 = object->layers()[i/2]; const Layer* layer1 = object->layers()[i * 2];
const Layer* layer2 = object->layers()[i/2 + 1]; const Layer* layer2 = object->layers()[i * 2 + 1];
Polygons polys; Polygons polys;
polys.reserve(layer1->slices.expolygons.size() + layer2->slices.expolygons.size()); polys.reserve(layer1->slices.expolygons.size() + layer2->slices.expolygons.size());
for (const ExPolygon &expoly : layer1->slices.expolygons) for (const ExPolygon &expoly : layer1->slices.expolygons)
@ -1008,8 +1013,7 @@ void GCode::_do_export(Print &print, FILE *file)
// Initialize a motion planner for object-to-object travel moves. // Initialize a motion planner for object-to-object travel moves.
if (print.config().avoid_crossing_perimeters.value) { if (print.config().avoid_crossing_perimeters.value) {
Polygons islands = collect_contours_all_layers(print.objects()); m_avoid_crossing_perimeters.init_external_mp(print);
m_avoid_crossing_perimeters.init_external_mp(union_ex(islands));
print.throw_if_canceled(); print.throw_if_canceled();
} }

5
src/libslic3r/GCode.hpp
View file

@ -45,12 +45,15 @@ public:
AvoidCrossingPerimeters() : use_external_mp(false), use_external_mp_once(false), disable_once(true) {} AvoidCrossingPerimeters() : use_external_mp(false), use_external_mp_once(false), disable_once(true) {}
~AvoidCrossingPerimeters() {} ~AvoidCrossingPerimeters() {}
void init_external_mp(const ExPolygons &islands) { m_external_mp = Slic3r::make_unique<MotionPlanner>(islands); } void init_external_mp(const Print &print);
void init_layer_mp(const ExPolygons &islands) { m_layer_mp = Slic3r::make_unique<MotionPlanner>(islands); } void init_layer_mp(const ExPolygons &islands) { m_layer_mp = Slic3r::make_unique<MotionPlanner>(islands); }
Polyline travel_to(const GCode &gcodegen, const Point &point); Polyline travel_to(const GCode &gcodegen, const Point &point);
private: private:
// For initializing the regions to avoid.
static Polygons collect_contours_all_layers(const PrintObjectPtrs& objects);
std::unique_ptr<MotionPlanner> m_external_mp; std::unique_ptr<MotionPlanner> m_external_mp;
std::unique_ptr<MotionPlanner> m_layer_mp; std::unique_ptr<MotionPlanner> m_layer_mp;
}; };